diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml index 24c21f1c9af8..69232f13e768 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml @@ -20,7 +20,6 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-boot - ${project.version} provided @@ -54,11 +53,11 @@ set-jsp-api-version validate - parse-version + parse-version - ${jsp.impl.version} - jspImpl + ${jsp.impl.version} + jspImpl diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml index ae565d4ba3c5..a341aa1fb92b 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml @@ -16,22 +16,18 @@ org.eclipse.jetty.ee10 jetty-ee10-annotations - ${project.version} org.eclipse.jetty.ee10 jetty-ee10-webapp - ${project.version} org.eclipse.jetty jetty-osgi - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} org.eclipse.platform diff --git a/jetty-ee10/jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/pom.xml index df9f3295c530..b801ed029f71 100644 --- a/jetty-ee10/jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/pom.xml @@ -12,19 +12,6 @@ pom - 3.18.100 - 3.11.0 - 1.6.1 - 1.5.0 - 1.4.1 - 3.7.100 - 1.2.0 - 1.2.0 - 1.0.2 - 1.0.1 - 1.5.4 - 1.0.2 - 1.0.0-v20070606 true @@ -38,6 +25,21 @@ test-jetty-ee10-osgi + + + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot + ${project.version} + + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot-jsp + ${project.version} + + + + @@ -83,56 +85,4 @@ - - - - org.eclipse.platform - org.eclipse.osgi.services - ${osgi-services-version} - - - - jakarta.servlet - servlet-api - - - - org.apache.felix - org.osgi.foundation - - - - - org.eclipse.platform - org.eclipse.osgi - ${osgi-version} - - - org.osgi - org.osgi.service.cm - ${osgi-service-cm-version} - - - org.osgi - org.osgi.service.component - ${osgi-service-component-version} - - - org.osgi - org.osgi.service.event - ${osgi-service-event-version} - - - org.osgi - org.osgi.util.tracker - ${osgi-util-tracker-version} - - - org.eclipse.equinox.http - servlet - ${equinox-http-servlet-version} - - - - diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml index 7bdf25346878..bc1169927e7f 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml @@ -12,12 +12,6 @@ ${project.groupId}.boot.test.osgi https://download.eclipse.org/jetty/orbit/ target/distribution - 4.13.1 - 2.6.2 - 1.8.3 - 3.0.0 - 1.3.6 - 1.2 true @@ -25,20 +19,17 @@ org.ops4j.pax.exam pax-exam - ${pax.exam.version} test org.ops4j.pax.exam pax-exam-inject - ${pax.exam.version} test org.ops4j.pax.exam pax-exam-container-forked - ${pax.exam.version} test @@ -54,12 +45,10 @@ org.ops4j.pax.tinybundles tinybundles - ${tinybundles.version} org.ops4j.pax.swissbox pax-swissbox-framework - ${swissbox.version} test @@ -71,31 +60,26 @@ org.ops4j.pax.swissbox pax-swissbox-tracker - ${swissbox.version} test org.ops4j.pax.exam pax-exam-junit4 - ${pax.exam.version} test org.ops4j.pax.exam pax-exam-link-mvn - ${pax.exam.version} test org.ops4j.pax.url pax-url-aether - ${pax.url.version} test org.ops4j.pax.url pax-url-wrap - ${pax.url.version} test @@ -127,37 +111,31 @@ org.eclipse.platform org.eclipse.osgi.util - ${osgi-util-version} test org.apache.geronimo.specs geronimo-atinject_1.0_spec - 1.2 test org.osgi org.osgi.util.promise - ${osgi-util-promise-version} test org.osgi org.osgi.util.measurement - ${osgi-util-measurement-version} test org.osgi org.osgi.util.position - ${osgi-util-position-version} test org.osgi org.osgi.util.xml - ${osgi-util-xml-version} test @@ -181,7 +159,6 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-boot - ${project.version} test @@ -197,7 +174,6 @@ org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-boot-jsp - ${project.version} test @@ -242,7 +218,6 @@ org.apache.aries.spifly org.apache.aries.spifly.dynamic.bundle - ${spifly.version} test @@ -385,7 +360,6 @@ org.eclipse.jetty jetty-alpn-server - ${project.version} test @@ -461,72 +435,60 @@ org.ow2.asm asm test - ${asm.version} org.ow2.asm asm-commons test - ${asm.version} org.ow2.asm asm-tree test - ${asm.version} org.ow2.asm asm-analysis test - ${asm.version} org.ow2.asm asm-util test - ${asm.version} org.eclipse.jetty.http2 jetty-http2-client - ${project.version} test org.eclipse.jetty.http2 jetty-http2-client-transport - ${project.version} test org.eclipse.jetty jetty-alpn-conscrypt-server - ${project.version} test org.eclipse.jetty jetty-alpn-conscrypt-client - ${project.version} test org.conscrypt conscrypt-openjdk-uber - ${conscrypt.version} test org.eclipse.jetty jetty-alpn-java-server - ${project.version} test org.eclipse.jetty jetty-alpn-java-client - ${project.version} test @@ -607,7 +569,7 @@ copy-dependencies - + test-jetty-ee10-osgi-webapp-resources