cleanup dependencies from jetty-ee9 osgi

Signed-off-by: Olivier Lamy <[email protected]>
jetty · Dec 28, 2022 · d5f8478 · d5f8478
1 parent d7c4c7a
commit d5f8478
Show file tree

Hide file tree

Showing 7 changed files with 189 additions and 192 deletions.
diff --git a/jetty-core/jetty-osgi/pom.xml b/jetty-core/jetty-osgi/pom.xml
@@ -13,19 +13,6 @@
   <properties>
     <bundle-symbolic-name>${project.groupId}.osgi</bundle-symbolic-name>
     <spotbugs.onlyAnalyze>org.eclipse.jetty.osgi.*</spotbugs.onlyAnalyze>
-    <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>
 
@@ -53,58 +40,6 @@
       </plugin>
     </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>
 
   <dependencies>
     <dependency>
@@ -139,7 +74,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.util.tracker</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/jetty-ee10/jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/pom.xml
@@ -13,7 +13,6 @@
 
   <properties>
     <osgi-version>3.18.100</osgi-version>
-    <osgi-annotation-version>8.1.0</osgi-annotation-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>
@@ -133,11 +132,6 @@
         <artifactId>servlet</artifactId>
         <version>${equinox-http-servlet-version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>osgi.annotation</artifactId>
-        <version>${osgi-annotation-version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml
@@ -20,7 +20,6 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee9.osgi</groupId>
       <artifactId>jetty-ee9-osgi-boot</artifactId>
-      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml
@@ -16,22 +16,18 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-annotations</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-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>

diff --git a/jetty-ee9/jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/pom.xml
@@ -12,20 +12,6 @@
   <packaging>pom</packaging>
 
   <properties>
-    <osgi-version>3.18.100</osgi-version>
-    <osgi-annotation-version>8.1.0</osgi-annotation-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>
 
@@ -38,6 +24,21 @@
     <module>test-jetty-ee9-osgi</module>
   </modules>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.eclipse.jetty.ee9.osgi</groupId>
+        <artifactId>jetty-ee9-osgi-boot</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.ee9.osgi</groupId>
+        <artifactId>jetty-ee9-osgi-boot-jsp</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <build>
     <resources>
       <resource>
@@ -82,62 +83,4 @@
       </plugin>
     </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>
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>osgi.annotation</artifactId>
-        <version>${osgi-annotation-version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
 </project>