- CHG: Dependency update to support Tomcat 10.1.

build.gradle

@@ -57,7 +57,7 @@ dependencies {
     implementation 'cisd:jhdf5:14.12.6'
     implementation 'net.coobird:thumbnailator:0.4.18'
 //    implementation 'com.zaxxer:HikariCP:4.0.3'
-    implementation 'org.jooq:jooq:3.16.6'
+    implementation 'org.jooq:jooq:3.16.18'
     implementation 'org.dhatim:fastexcel-reader:0.14.0'
     implementation 'com.drewnoakes:metadata-extractor:2.18.0'
     implementation 'xerces:xercesImpl:2.12.2'
@@ -68,8 +68,8 @@ dependencies {
 
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
     implementation 'javax.activation:activation:1.1.1'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
-    implementation 'org.glassfish.jaxb:jaxb-runtime:3.0.2'
+    implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.2'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
 
     implementation 'org.flywaydb:flyway-core:6.5.7'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@@ -78,11 +78,11 @@ dependencies {
 
     implementation 'de.ipk-gatersleben:isa4j:1.1.0'
 
-    compileOnly 'jakarta.platform:jakarta.jakartaee-api:9.1.0'
+    providedCompile 'jakarta.servlet:jakarta.servlet-api:6.0.0'
 
-    implementation 'org.glassfish.jersey.containers:jersey-container-servlet:3.0.8'
-    implementation 'org.glassfish.jersey.inject:jersey-hk2:3.0.8'
-    implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.0.8'
+    implementation 'org.glassfish.jersey.containers:jersey-container-servlet:3.1.1'
+    implementation 'org.glassfish.jersey.inject:jersey-hk2:3.1.1'
+    implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.1.1'
 
     implementation 'javax.media:jai_core:1.1.3'
     implementation 'org.geotools:gt-shapefile:27.2'

src/main/java/jhi/germinate/server/AuthenticationFilter.java

@@ -52,7 +52,6 @@ public static void updateAcceptedDatasets(HttpServletRequest req, HttpServletRes
 		ids.add(licenseId);
 
 		Cookie cookie = new Cookie("accepted-licenses", CollectionUtils.join(ids, ","));
-		cookie.setVersion(0);
 		cookie.setPath(getContextPath(req));
 		cookie.setMaxAge((int) (AGE / 1000));
 		cookie.setHttpOnly(true);
@@ -292,15 +291,13 @@ private static void setCookie(String token, HttpServletRequest request, HttpServ
 		if (delete)
 		{
 			Cookie cookie = new Cookie("token", "");
-			cookie.setVersion(0);
 			cookie.setPath(getContextPath(request));
 			cookie.setMaxAge(0);
 			cookie.setHttpOnly(true);
 			response.addCookie(cookie);
 
 			// This is for the docker image that uses a proxy-reverse
 			cookie = new Cookie("token", "");
-			cookie.setVersion(0);
 			cookie.setPath("/");
 			cookie.setMaxAge(0);
 			cookie.setHttpOnly(true);
@@ -309,7 +306,6 @@ private static void setCookie(String token, HttpServletRequest request, HttpServ
 		else
 		{
 			Cookie cookie = new Cookie("token", token);
-			cookie.setVersion(0);
 			cookie.setPath(getContextPath(request));
 			cookie.setMaxAge((int) (AGE / 1000));
 			cookie.setHttpOnly(true);
@@ -325,7 +321,6 @@ private static void setDatasetCookie(boolean delete, HttpServletRequest request,
 		if (!CollectionUtils.isEmpty(ids))
 		{
 			Cookie cookie = new Cookie("accepted-licenses", CollectionUtils.join(ids, ","));
-			cookie.setVersion(0);
 			cookie.setPath(getContextPath(request));
 			cookie.setMaxAge(delete ? 0 : (int) (AGE / 1000));
 			cookie.setHttpOnly(true);