refactor: 💡 Further deps updates

perun-oidc-server/pom.xml

@@ -120,16 +120,12 @@
 			<artifactId>javax.annotation-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>jakarta.xml.bind</groupId>
+			<groupId>org.glassfish</groupId>
-			<artifactId>jakarta.xml.bind-api</artifactId>
+			<artifactId>javax.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.glassfish.jaxb</groupId>
+			<groupId>org.glassfish.web</groupId>
-			<artifactId>jaxb-runtime</artifactId>
+			<artifactId>jakarta.servlet.jsp.jstl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.directory.api</groupId>
@@ -147,6 +143,10 @@
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>javax.persistence-api</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

perun-oidc-server/src/main/java/cz/muni/ics/mdc/MultiMDCFilter.java

@@ -1,7 +1,8 @@
 package cz.muni.ics.mdc;
 
-import java.io.IOException;
+
 import javax.servlet.FilterChain;
+import java.io.IOException;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -23,7 +24,7 @@ public class MultiMDCFilter extends GenericFilterBean {
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
-            throws IOException, ServletException
+            throws ServletException, IOException
     {
         remoteAddressMDCFilter.doFilter(servletRequest);
         sessionIdMDCFilter.doFilter(servletRequest);

perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/PerunOIDCTokenService.java

@@ -3,6 +3,7 @@ package cz.muni.ics.oidc.server;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
+import com.nimbusds.jose.shaded.json.JSONArray;
 import com.nimbusds.jose.util.JSONObjectUtils;
 import com.nimbusds.jwt.JWTClaimsSet;
 import cz.muni.ics.oauth2.model.ClientDetailsEntity;
@@ -15,7 +16,6 @@ import java.text.ParseException;
 import java.util.Map;
 import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
-import net.minidev.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.oauth2.provider.OAuth2Request;
 

perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/ClientAPI.java

@@ -568,7 +568,7 @@ public class ClientAPI {
 								newClient.setJwksUri(claimSet.getStringClaim(claim));
 								break;
 							case JWKS:
-								newClient.setJwks(JWKSet.parse(claimSet.getJSONObjectClaim(claim).toJSONString()));
+								newClient.setJwks(JWKSet.parse(claimSet.getJSONObjectClaim(claim)));
 								break;
 							case POLICY_URI:
 								newClient.setPolicyUri(claimSet.getStringClaim(claim));

perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/DynamicClientRegistrationEndpoint.java

@@ -681,7 +681,7 @@ public class DynamicClientRegistrationEndpoint {
 								newClient.setJwksUri(claimSet.getStringClaim(claim));
 								break;
 							case JWKS:
-								newClient.setJwks(JWKSet.parse(claimSet.getJSONObjectClaim(claim).toJSONString()));
+								newClient.setJwks(JWKSet.parse(claimSet.getJSONObjectClaim(claim)));
 								break;
 							case POLICY_URI:
 								newClient.setPolicyUri(claimSet.getStringClaim(claim));

pom.xml

@@ -82,18 +82,19 @@
 		<!-- Database -->
 		<postgresql.version>42.3.1</postgresql.version>
 		<mysql.version>8.0.27</mysql.version>
-		<hsqldb.version>2.5.2</hsqldb.version>
+		<hsqldb.version>2.6.1</hsqldb.version>
 		<mariadb-java-client.version>2.7.4</mariadb-java-client.version>
-		<hikari.version>3.4.5</hikari.version>
+		<hikari.version>5.0.0</hikari.version>
-		<shedlock.version>4.3.1</shedlock.version>
+		<shedlock.version>4.3.1</shedlock.version><!-- CANNOT BE UPGRADED DUE TO SPRING 4 Compatibility -->
 		<shedlock-spring.version>${shedlock.version}</shedlock-spring.version>
 		<shedlock-provider-jdbc-template.version>${shedlock.version}</shedlock-provider-jdbc-template.version>
 
 		<!-- Servlet -->
-		<jakarta-jstl.version>1.2.6</jakarta-jstl.version>
+		<glassfish-servlet.version>3.1.1</glassfish-servlet.version>
-		<jakarta-servlet-api.version>4.0.4</jakarta-servlet-api.version>
+		<glassfish-jstl.version>1.2.6</glassfish-jstl.version>
 
 		<!-- Eclipse -->
+		<javax-persistence-api.version>2.2</javax-persistence-api.version>
 		<eclipse-persistence.version>2.7.9</eclipse-persistence.version>
 		<eclipse-persistence-core.version>${eclipse-persistence.version}</eclipse-persistence-core.version>
 		<eclipse-persistence-jpa.version>${eclipse-persistence.version}</eclipse-persistence-jpa.version>
@@ -112,7 +113,7 @@
 		<guava.version>31.0.1-jre</guava.version>
 		<gson.version>2.8.9</gson.version>
 		<httpclient.version>4.5.13</httpclient.version>
-		<nimbus-jose-jwt.version>8.23</nimbus-jose-jwt.version>
+		<nimbus-jose-jwt.version>9.15.2</nimbus-jose-jwt.version>
 		<javax-annotation-api.version>1.3.2</javax-annotation-api.version>
 		<jaxb.version>2.3.3</jaxb.version>
 		<aspectjweaver.version>1.9.7</aspectjweaver.version>
@@ -176,16 +177,14 @@
 
 			<!-- Servlet -->
 			<dependency>
-				<groupId>jakarta.servlet</groupId>
+				<groupId>org.glassfish</groupId>
-				<artifactId>jakarta.servlet-api</artifactId>
+				<artifactId>javax.servlet</artifactId>
-				<version>${jakarta-servlet-api.version}</version>
+				<version>${glassfish-servlet.version}</version>
-				<scope>provided</scope>
 			</dependency>
-			<!-- Replace this with the 2+ version when migrated to tomcat 10+ -->
 			<dependency>
 				<groupId>org.glassfish.web</groupId>
 				<artifactId>jakarta.servlet.jsp.jstl</artifactId>
-				<version>${jakarta-jstl.version}</version>
+				<version>${glassfish-jstl.version}</version>
 			</dependency>
 
 			<!-- Database -->
@@ -227,6 +226,12 @@
 			</dependency>
 
 			<!-- Eclipse Persistence -->
+			<!-- https://mvnrepository.com/artifact/javax.persistence/javax.persistence-api -->
+			<dependency>
+				<groupId>javax.persistence</groupId>
+				<artifactId>javax.persistence-api</artifactId>
+				<version>${javax-persistence-api.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.eclipse.persistence</groupId>
 				<artifactId>org.eclipse.persistence.core</artifactId>
@@ -342,6 +347,10 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.8.1</version>
+					<configuration>
+						<source>${java.version}</source>
+						<target>${java.version}</target>
+					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.appfuse.plugins</groupId>
@@ -366,10 +375,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>