fix(DPE-107): upgrade to osgi spec 8.1.0

Talend · Dec 6, 2024 · ca4513d · ca4513d
1 parent 03a51f8
commit ca4513d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/pax-web-features/src/main/resources/features.xml b/pax-web-features/src/main/resources/features.xml
@@ -52,6 +52,8 @@
 		<bundle start-level="30" start="false">mvn:org.ops4j.pax.web/pax-web-compatibility-servlet5/${project.version}</bundle>
 		<bundle start-level="30">wrap:mvn:jakarta.servlet/jakarta.servlet-api/${dependency.jakarta.servlet4-api}$overwrite=merge&amp;Bundle-SymbolicName=jakarta.servlet-api-40</bundle>
 		<bundle start-level="30" start="false">mvn:org.ops4j.pax.web/pax-web-compatibility-servlet31/${project.version}</bundle>
+		<bundle start-level="30" start="false">mvn:org.osgi/org.osgi.service.jakartars/${dependency.org.osgi.service.jakartars}</bundle>
+		<bundle start-level="30" start="false">mvn:org.osgi/org.osgi.service.servlet/${dependency.org.osgi.service.servlet}</bundle>
 
 		<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-api/${project.version}</bundle>
 		<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-spi/${project.version}</bundle>

diff --git a/pax-web-itest/pax-web-itest-karaf/pom.xml b/pax-web-itest/pax-web-itest-karaf/pom.xml
@@ -260,11 +260,7 @@
 
 		<!-- OSGi -->
 
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>osgi.cmpn</artifactId>
-			<scope>test</scope>
-		</dependency>
+
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.util.function</artifactId>
@@ -381,8 +377,9 @@
 			<artifactId>jakarta.websocket-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<groupId>jakarta.activation</groupId>
+			<artifactId>jakarta.activation-api</artifactId>
+			<version>1.2.1</version>
 		</dependency>
 
 		<dependency>

diff --git a/pax-web-karaf/pom.xml b/pax-web-karaf/pom.xml
@@ -124,8 +124,14 @@
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
-			<artifactId>osgi.cmpn</artifactId>
-			<version>7.0.0</version>
+			<artifactId>org.osgi.service.jakartars</artifactId>
+			<version>${dependency.org.osgi.service.jakartars}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.servlet</artifactId>
+			<version>${dependency.org.osgi.service.servlet}</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/pax-web-karaf/src/main/java/org/ops4j/pax/web/karaf/commands/WabListCommand.java b/pax-web-karaf/src/main/java/org/ops4j/pax/web/karaf/commands/WabListCommand.java
@@ -25,7 +25,7 @@
 import org.ops4j.pax.web.service.WebContainer;
 import org.ops4j.pax.web.service.spi.model.info.WebApplicationInfo;
 import org.ops4j.pax.web.service.spi.model.views.ReportWebContainerView;
-import org.osgi.service.http.runtime.HttpServiceRuntimeConstants;
+import org.osgi.service.servlet.runtime.HttpServiceRuntimeConstants;
 
 @Command(scope = "web", name = "wab-list", description = "Lists all available, deployed Web Application Bundles.")
 @Service

diff --git a/pax-web-karaf/src/main/java/org/ops4j/pax/web/karaf/commands/WebCommand.java b/pax-web-karaf/src/main/java/org/ops4j/pax/web/karaf/commands/WebCommand.java
@@ -20,7 +20,7 @@
 import org.ops4j.pax.web.service.WebContainer;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.http.runtime.HttpServiceRuntime;
+import org.osgi.service.servlet.runtime.HttpServiceRuntime;
 
 public abstract class WebCommand implements Action {