Skip to content

Commit

Permalink
cleanup dependencies from jetty-ee10 osgi
Browse files Browse the repository at this point in the history 
Signed-off-by: Olivier Lamy <[email protected]>
  • Loading branch information
@olamy
olamy committed Dec 29, 2022
1 parent 7f39847 commit 0b98861
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 112 deletions.
7 changes: 3 additions & 4 deletions jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-boot</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -54,11 +53,11 @@
<id>set-jsp-api-version</id>
<phase>validate</phase>
<goals>
<goal>parse-version</goal>
<goal>parse-version</goal>
</goals>
<configuration>
<versionString>${jsp.impl.version}</versionString>
<propertyPrefix>jspImpl</propertyPrefix>
<versionString>${jsp.impl.version}</versionString>
<propertyPrefix>jspImpl</propertyPrefix>
</configuration>
</execution>
</executions>
Expand Down
4 changes: 0 additions & 4 deletions jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,18 @@
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-annotations</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-webapp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-osgi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
Expand Down
80 changes: 15 additions & 65 deletions jetty-ee10/jetty-ee10-osgi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
<packaging>pom</packaging>

<properties>
<osgi-version>3.18.100</osgi-version>
<osgi-services-version>3.11.0</osgi-services-version>
<osgi-service-cm-version>1.6.1</osgi-service-cm-version>
<osgi-service-component-version>1.5.0</osgi-service-component-version>
<osgi-service-event-version>1.4.1</osgi-service-event-version>
<osgi-util-version>3.7.100</osgi-util-version>
<osgi-util-function-version>1.2.0</osgi-util-function-version>
<osgi-util-promise-version>1.2.0</osgi-util-promise-version>
<osgi-util-measurement-version>1.0.2</osgi-util-measurement-version>
<osgi-util-position-version>1.0.1</osgi-util-position-version>
<osgi-util-tracker-version>1.5.4</osgi-util-tracker-version>
<osgi-util-xml-version>1.0.2</osgi-util-xml-version>
<equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
<jacoco.skip>true</jacoco.skip>
</properties>

Expand All @@ -38,6 +25,21 @@
<module>test-jetty-ee10-osgi</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-boot</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-boot-jsp</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<resources>
<resource>
Expand Down Expand Up @@ -83,56 +85,4 @@
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>${osgi-services-version}</version>
<exclusions>
<exclusion>
<!-- we use the servlet jar from orbit -->
<groupId>jakarta.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<!-- cannot override core java classes with Java 9+ -->
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.foundation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${osgi-version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<version>${osgi-service-cm-version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
<version>${osgi-service-component-version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.event</artifactId>
<version>${osgi-service-event-version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.tracker</artifactId>
<version>${osgi-util-tracker-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox.http</groupId>
<artifactId>servlet</artifactId>
<version>${equinox-http-servlet-version}</version>
</dependency>
</dependencies>
</dependencyManagement>

</project>
40 changes: 1 addition & 39 deletions jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,24 @@
<bundle-symbolic-name>${project.groupId}.boot.test.osgi</bundle-symbolic-name>
<jetty-orbit-url>https://download.eclipse.org/jetty/orbit/</jetty-orbit-url>
<assembly-directory>target/distribution</assembly-directory>
<pax.exam.version>4.13.1</pax.exam.version>
<pax.url.version>2.6.2</pax.url.version>
<swissbox.version>1.8.3</swissbox.version>
<tinybundles.version>3.0.0</tinybundles.version>
<spifly.version>1.3.6</spifly.version>
<injection.bundle.version>1.2</injection.bundle.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<dependencies>
<!-- Pax Exam Dependencies -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-inject</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<!-- Use the forked container so we can pass it system properties eg for alpn -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-forked</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -54,12 +45,10 @@
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
<version>${tinybundles.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-framework</artifactId>
<version>${swissbox.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -71,31 +60,26 @@
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-tracker</artifactId>
<version>${swissbox.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>${pax.url.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<version>${pax.url.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -127,37 +111,31 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.util</artifactId>
<version>${osgi-util-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<version>1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
<version>${osgi-util-promise-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.measurement</artifactId>
<version>${osgi-util-measurement-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.position</artifactId>
<version>${osgi-util-position-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.xml</artifactId>
<version>${osgi-util-xml-version}</version>
<scope>test</scope>
</dependency>
<!-- Jetty OSGi Deps -->
Expand All @@ -181,7 +159,6 @@
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-boot</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -197,7 +174,6 @@
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-boot-jsp</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -242,7 +218,6 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>${spifly.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -385,7 +360,6 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -461,72 +435,60 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<scope>test</scope>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<scope>test</scope>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<scope>test</scope>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<scope>test</scope>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-client-transport</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.conscrypt</groupId>
<artifactId>conscrypt-openjdk-uber</artifactId>
<version>${conscrypt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -607,7 +569,7 @@
<goals>
<goal>copy-dependencies</goal>
</goals>
</execution>
</execution>
</executions>
<configuration>
<includeArtifactIds>test-jetty-ee10-osgi-webapp-resources</includeArtifactIds>
Expand Down

0 comments on commit 0b98861

Please sign in to comment.