Merge branch 'branches/rudder/8.2'

Normation · Aug 30, 2024 · 2f1978f · 2f1978f
2 parents bbd387b + 8060d02
commit 2f1978f
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 31 deletions.
diff --git a/api-authorizations/pom-template.xml b/api-authorizations/pom-template.xml
@@ -47,10 +47,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/auth-backends/pom-template.xml b/auth-backends/pom-template.xml
@@ -64,10 +64,8 @@
       <version>${spring-security-version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
     <!-- undeclared needed dependency - be careful, check compat of nimbus-jose with spring version too! -->
     <dependency>

diff --git a/auth-backends/src/main/scala/bootstrap/rudder/plugin/AuthBackendsConf.scala b/auth-backends/src/main/scala/bootstrap/rudder/plugin/AuthBackendsConf.scala
@@ -68,8 +68,8 @@ import com.normation.zio.*
 import com.typesafe.config.ConfigException
 import java.net.URI
 import java.util
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
 import org.joda.time.DateTime
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware

diff --git a/branding/pom-template.xml b/branding/pom-template.xml
@@ -44,10 +44,8 @@
   <dependencies>
     <!-- Add other plugin specific dependencies -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/change-validation/pom-template.xml b/change-validation/pom-template.xml
@@ -68,10 +68,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/datasources/pom-template.xml b/datasources/pom-template.xml
@@ -50,10 +50,8 @@
   <dependencies>
     <!-- common data definition for plugins -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
 
     <!-- Test: rudder -->

diff --git a/openscap/pom-template.xml b/openscap/pom-template.xml
@@ -57,10 +57,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
 
   </dependencies>

diff --git a/plugins-common/pom-template.xml b/plugins-common/pom-template.xml
@@ -303,7 +303,7 @@
     <dependency><groupId>io.github.java-diff-utils</groupId><artifactId>java-diff-utils</artifactId><scope>provided</scope></dependency>
     <dependency><groupId>io.scalaland</groupId><artifactId>chimney_${scala-binary-version}</artifactId><scope>provided</scope><version>${chimney-version}</version></dependency>
     <dependency><groupId>io.scalaland</groupId><artifactId>chimney-macro-commons_${scala-version}</artifactId><scope>provided</scope><version>${chimney-version}</version></dependency>
-    <dependency><groupId>javax.servlet</groupId><artifactId>javax.servlet-api</artifactId><scope>provided</scope></dependency>
+    <dependency><groupId>jakarta.servlet</groupId><artifactId>jakarta.servlet-api</artifactId><scope>provided</scope>><version>${servlet-version}</version></dependency>
     <dependency><groupId>joda-time</groupId><artifactId>joda-time</artifactId><scope>provided</scope><version>${jodatime-version}</version></dependency>
     <dependency><groupId>net.java.dev.jna</groupId><artifactId>jna</artifactId><scope>provided</scope></dependency>
     <dependency><groupId>net.liftweb</groupId><artifactId>lift-actor_${scala-binary-version}</artifactId><scope>provided</scope><version>${lift-version}</version></dependency>

diff --git a/scale-out-relay/pom-template.xml b/scale-out-relay/pom-template.xml
@@ -45,10 +45,8 @@
   <dependencies>
     <!-- Add other plugin specific dependencies -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
   </dependencies>