WIP: Dependency Upgrade to Spring Boot 3.0.6

Evolveum · Apr 24, 2023 · 98e41a0 · 98e41a0
1 parent a8a624a
commit 98e41a0
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/model/authentication-api/pom.xml b/model/authentication-api/pom.xml
@@ -74,8 +74,8 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>

diff --git a/model/authentication-impl/pom.xml b/model/authentication-impl/pom.xml
@@ -87,10 +87,13 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
         </dependency>
+        <!--  Spring Security CAS was removed in spring 6.0.x -->
+        <!--  
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-cas</artifactId>
         </dependency>
+        -->
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-saml2-service-provider</artifactId>
@@ -166,9 +169,9 @@
             <groupId>com.github.openjson</groupId>
             <artifactId>openjson</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+       <dependency>
+           <groupId>jakarta.servlet</groupId>
+           <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

diff --git a/model/notifications-impl/pom.xml b/model/notifications-impl/pom.xml
@@ -111,7 +111,7 @@
             <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.mail</groupId>
+            <groupId>org.eclipse.angus</groupId>
             <artifactId>jakarta.mail</artifactId>
         </dependency>
         <dependency>

diff --git a/model/rest-impl/pom.xml b/model/rest-impl/pom.xml
@@ -90,8 +90,8 @@
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -98,7 +98,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.7.3</version>
+        <version>3.0.6</version>
         <!-- This parent also declares dependencies listed here:
         https://docs.spring.io/spring-boot/docs/2.7.3/reference/html/dependency-versions.html#dependency-versions
         Or for current version of Spring Boot:
@@ -238,8 +238,8 @@
         <wicket.version>9.12.0.e1</wicket.version>
         <wicketstuff.version>9.12.0</wicketstuff.version>
         <wicket.chartjs.version>0.1</wicket.chartjs.version>
-        <!-- Groovy 3.0.12 is also default for Spring Boot 2.7.3 -->
-        <groovy.version>3.0.12</groovy.version>
+        <!-- Groovy 4.0.11 is also default for Spring Boot 3.0.6 -->
+        <groovy.version>4.0.11</groovy.version>
         <xmlsec.version>2.2.4</xmlsec.version>
         <!-- NOTE: also update the version number in TestConnectorManager -->
         <connid.version>1.5.1.10</connid.version>

diff --git a/testing/story/pom.xml b/testing/story/pom.xml
@@ -292,6 +292,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.30</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/tools/ninja/pom.xml b/tools/ninja/pom.xml
@@ -151,8 +151,8 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>