FIX: INCOPATIBILITY WITH SPRING 6

Author: Alex-GF

pom.xml

@@ -7,7 +7,7 @@
 
 	<groupId>io.github.isa-group</groupId>
 	<artifactId>Pricing4Java</artifactId>
-	<version>3.1.0</version>
+	<version>3.2.0</version>
 
 	<name>${project.groupId}:${project.artifactId}</name>
 	<description>A pricing driven feature toggling library for java</description>
@@ -51,8 +51,8 @@
 	<properties>
 		<jackson.version>2.14.2</jackson.version>
 		<aspectj.version>1.9.7</aspectj.version>
-		<spring.version>5.3.24</spring.version>
-		<spring.boot.version>2.7.6</spring.boot.version>
+		<spring.version>6.1.5</spring.version>
+		<spring.boot.version>3.2.0</spring.boot.version>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 	</properties>
@@ -137,7 +137,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.9.3</version>
+			<version>5.10.2</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -159,6 +159,20 @@
 			<artifactId>snakeyaml</artifactId>
 			<version>1.33</version>
 		</dependency>
+
+		<!-- API, java.xml.bind module -->
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>2.3.2</version>
+		</dependency>
+
+		<!-- Runtime, com.sun.xml.bind module -->
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>2.3.2</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/io/github/isagroup/PricingEvaluatorUtil.java

@@ -15,7 +15,7 @@
 import io.github.isagroup.models.FeatureStatus;
 import io.github.isagroup.models.PlanContextManager;
 import io.github.isagroup.models.PricingManager;
-import io.github.isagroup.services.jwt.JwtUtils;
+import io.github.isagroup.services.jwt.PricingJwtUtils;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 
@@ -27,14 +27,14 @@
 public class PricingEvaluatorUtil {
 
     @Autowired
-    private JwtUtils jwtUtils;
+    private PricingJwtUtils jwtUtils;
 
     @Autowired
     private PricingContext pricingContext;
 
     public PricingEvaluatorUtil(PricingContext pricingContext) {
         this.pricingContext = pricingContext;
-        this.jwtUtils = new JwtUtils(pricingContext);
+        this.jwtUtils = new PricingJwtUtils(pricingContext);
     }
 
     Logger logger = Logger.getLogger(PricingEvaluatorUtil.class.getName());

src/main/java/io/github/isagroup/filters/RenewTokenFilter.java

@@ -2,10 +2,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
@@ -14,12 +14,12 @@
 
 import io.github.isagroup.PricingContext;
 import io.github.isagroup.PricingEvaluatorUtil;
-import io.github.isagroup.services.jwt.JwtUtils;
+import io.github.isagroup.services.jwt.PricingJwtUtils;
 
 public class RenewTokenFilter extends OncePerRequestFilter {
 
 	@Autowired
-	private JwtUtils jwtUtils;
+	private PricingJwtUtils jwtUtils;
 
 	@Value("${petclinic.app.jwtSecret}")
 	private String jwtSecret;

…thub/isagroup/services/jwt/JwtUtils.java …agroup/services/jwt/PricingJwtUtils.javasrc/main/java/io/github/isagroup/services/jwt/JwtUtils.java renamed to src/main/java/io/github/isagroup/services/jwt/PricingJwtUtils.java src/main/java/io/github/isagroup/services/jwt/JwtUtils.java renamed to src/main/java/io/github/isagroup/services/jwt/PricingJwtUtils.java

@@ -22,16 +22,16 @@
  * Utility class that provides methods to generate and manage JWT.
  */
 @Component
-public class JwtUtils {
+public class PricingJwtUtils {
 
 	@Autowired
 	private PricingContext pricingContext;
 
-	public JwtUtils(PricingContext pricingContext) {
+	public PricingJwtUtils(PricingContext pricingContext) {
 		this.pricingContext = pricingContext;
 	}
 
-	private static final Logger logger = LoggerFactory.getLogger(JwtUtils.class);
+	private static final Logger logger = LoggerFactory.getLogger(PricingJwtUtils.class);
 
 	/**
 	 * Extracts the subject from the given JWT.

src/test/java/io/github/isagroup/PricingEvaluatorUtilTests.java

@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import io.github.isagroup.services.jwt.JwtUtils;
+import io.github.isagroup.services.jwt.PricingJwtUtils;
 
 public class PricingEvaluatorUtilTests {
 
@@ -26,7 +26,7 @@ public class PricingEvaluatorUtilTests {
 
         private PricingEvaluatorUtil pricingEvaluatorUtil;
 
-        private JwtUtils jwtUtils;
+        private PricingJwtUtils jwtUtils;
 
         @BeforeEach
         public void setUp() {
@@ -51,7 +51,7 @@ public void setUp() {
 
                 this.pricingContext = pricingContext;
                 this.pricingEvaluatorUtil = new PricingEvaluatorUtil(pricingContext);
-                this.jwtUtils = new JwtUtils(pricingContext);
+                this.jwtUtils = new PricingJwtUtils(pricingContext);
         }
 
         @Test

src/test/java/io/github/isagroup/PricingPlanAwareTests.java

@@ -24,12 +24,12 @@
 import io.github.isagroup.annotations.PricingPlanAwareAspect;
 import io.github.isagroup.exceptions.FilepathException;
 import io.github.isagroup.exceptions.PricingPlanEvaluationException;
-import io.github.isagroup.services.jwt.JwtUtils;
+import io.github.isagroup.services.jwt.PricingJwtUtils;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
 @Import({ io.github.isagroup.annotations.PricingPlanAwareAspect.class, io.github.isagroup.PricingEvaluatorUtil.class,
-        io.github.isagroup.services.jwt.JwtUtils.class })
+        io.github.isagroup.services.jwt.PricingJwtUtils.class })
 public class PricingPlanAwareTests {
 
     private static final String JWT_SECRET_TEST = "secret";
@@ -122,7 +122,7 @@ public Object getUserAuthorities() {
     private PricingEvaluatorUtil pricingEvaluatorUtil;
 
     @Autowired
-    private JwtUtils jwtUtils;
+    private PricingJwtUtils jwtUtils;
 
     @Mock
     private ProceedingJoinPoint joinPoint;