migration of moskito-springboot2 package to java11+ support and sprin…

…gboot 3.3.x
anotheria · Jul 19, 2024 · 3aeeb46 · 3aeeb46
1 parent c0f41d4
commit 3aeeb46
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/moskito-integration/moskito-springboot2/pom.xml b/moskito-integration/moskito-springboot2/pom.xml
@@ -2,13 +2,13 @@
 
     <parent>
         <groupId>net.anotheria</groupId>
-		    <artifactId>moskito-integration</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <artifactId>moskito-integration</artifactId>
+        <version>4.0.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>moskito-springboot2</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.3-SNAPSHOT</version>
     <name>moskito springboot 2 integration</name>
 
     <dependencies>
@@ -36,24 +36,25 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
-            <version>2.6.2</version>
+            <version>3.3.2</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
-            <version>2.6.2</version>
+            <version>3.3.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
-            <version>2.6.2</version>
+            <version>3.3.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/.../src/main/java/net/anotheria/moskito/integration/springboot/MoskitoAutoConfiguration.java b/.../src/main/java/net/anotheria/moskito/integration/springboot/MoskitoAutoConfiguration.java
@@ -1,6 +1,6 @@
 package net.anotheria.moskito.integration.springboot;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import net.anotheria.moskito.web.filters.AsyncSourceTldFilter;
 import net.anotheria.moskito.web.filters.DebugRequestFilter;
 import net.anotheria.moskito.web.filters.GenericMonitoringFilter;

diff --git a/moskito-integration/pom.xml b/moskito-integration/pom.xml
@@ -20,6 +20,6 @@
         <module>moskito-inspect-remote</module>
         <module>moskito-inspect-embedded</module>
 <!--        <module>moskito-springboot</module>-->
-<!--        <module>moskito-springboot2</module>-->
+        <module>moskito-springboot2</module>
     </modules>
 </project>