Bump dependencies

.github/workflows/bootjar_testing.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [17]
+        java: [17, 21]
 
     steps:
       - name: Checkout code

.github/workflows/gradle.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         operating-system: [ubuntu-latest, macOS-latest]
         # Use both LTS releases and latest one for tests
-        jdk: [ 17 ]
+        jdk: [ 17, 21 ]
     steps:
     - name: Checkout repo
       uses: actions/checkout@v4

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "org.springframework.boot" version "2.7.5"
-    id "io.spring.dependency-management" version "1.1.0"
+    id "org.springframework.boot" version "3.4.5"
+    id "io.spring.dependency-management" version "1.1.4"
     id "io.freefair.maven-publish-java" version "6.5.1"
     id "com.github.kt3k.coveralls" version "2.12.0"
     id "org.owasp.dependencycheck" version "7.3.0"
@@ -31,11 +31,12 @@ configurations {
 
 ext {
     set('javersVersion', "6.8.0")
-    set('springBootVersion', "2.7.5")
-    set('springDocVersion', "1.6.9")
+    set('jenaVersion', "5.4.0")
+    set('springBootVersion', "3.4.5")
+    set('springDocVersion', "2.5.0")
     set('keycloakVersion', "19.0.0")
-    set('junitPlatformVersion', "1.2.0")
-    set('junitJupiterVersion', "5.2.0")
+    set('junitPlatformVersion', "1.11.4")
+    set('junitJupiterVersion', "5.11.4")
 
     // directory for generated code snippets during tests
     snippetsDir = file("build/generated-snippets")
@@ -80,7 +81,7 @@ dependencies {
 
     //implementation "org.springframework.security:spring-security-web:5.7.5"
     //implementation "org.springframework.security:spring-security-config:5.7.5"
-    implementation "org.thymeleaf:thymeleaf-spring5"
+    implementation "org.thymeleaf:thymeleaf-spring6"
 
 
     // cloud support
@@ -90,23 +91,21 @@ dependencies {
     //implementation 'de.codecentric:spring-boot-admin-starter-client:2.7.10'
 
     // springdoc
-    implementation "org.springdoc:springdoc-openapi-ui:${springDocVersion}"
-    implementation "org.springdoc:springdoc-openapi-data-rest:${springDocVersion}"
-    implementation "org.springdoc:springdoc-openapi-webmvc-core:${springDocVersion}"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion}"
 
     //Keycloak
     // implementation "org.keycloak:keycloak-spring-boot-starter:${keycloakVersion}"
-    implementation "com.nimbusds:nimbus-jose-jwt:9.24.3"
+    implementation 'com.nimbusds:nimbus-jose-jwt:9.37.2'
     implementation "io.jsonwebtoken:jjwt-api:0.11.5"
     implementation "io.jsonwebtoken:jjwt-impl:0.11.5"
     implementation "io.jsonwebtoken:jjwt-jackson:0.11.5"
 
     //Jena
-    implementation "org.apache.jena:apache-jena-libs:4.10.0"
-    implementation "org.apache.jena:jena-fuseki:4.10.0"
-    implementation "org.apache.jena:jena-fuseki-server:4.10.0"
+    implementation "org.apache.jena:apache-jena-libs:${jenaVersion}"
+    implementation "org.apache.jena:jena-fuseki:${jenaVersion}"
+    implementation "org.apache.jena:jena-fuseki-server:${jenaVersion}"
 
-    implementation "org.apache.jena:jena-commonsrdf:4.10.0"
+    implementation "org.apache.jena:jena-commonsrdf:${jenaVersion}"
     implementation "org.apache.thrift:libthrift:0.18.1"
 
     implementation "org.apache.commons:commons-rdf-jsonld-java:0.5.0"
@@ -115,11 +114,11 @@ dependencies {
     implementation "org.apache.commons:commons-collections4:4.1"
 
      // driver for postgres
-    implementation "org.postgresql:postgresql:42.5.0"
+    implementation 'org.postgresql:postgresql:42.7.2'
     //driver for h2
-    implementation "com.h2database:h2:2.1.214"
+    implementation 'com.h2database:h2:2.2.220'
 
-    testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:2.0.6.RELEASE"
+    testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:3.0.3"
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "org.springframework:spring-test"
    // testImplementation "org.springframework.security:spring-security-test"
@@ -131,7 +130,7 @@ dependencies {
     testImplementation "io.rest-assured:rest-assured"
     testImplementation "io.rest-assured:spring-mock-mvc"
     testImplementation "io.rest-assured:rest-assured"
-    testImplementation ("io.specto:hoverfly-java-junit5:0.17.1") {
+    testImplementation ("io.specto:hoverfly-java-junit5:0.20.0") {
         exclude group: 'ch.qos.logback', module: 'logback-classic'
     }
 
@@ -168,7 +167,7 @@ test {
    environment "spring.config.location", "classpath:/test-config/"
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     testLogging {
         events 'started', 'passed'
     }
@@ -183,13 +182,13 @@ bootJar {
     archiveFileName = "${archiveBaseName.get()}.${archiveExtension.get()}"
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
-        attributes 'Main-Class': 'org.springframework.boot.loader.PropertiesLauncher'
+        attributes 'Main-Class': 'org.springframework.boot.loader.launch.PropertiesLauncher'
     }
     launchScript()
 }
 
 // task for printing project name.
-task printProjectName {
+tasks.register('printProjectName') {
     doLast {
         println "${project.name}"
     }

gradle/profile-complete.gradle

@@ -7,7 +7,7 @@ test {
 jacocoTestReport {
     dependsOn test
     reports {
-        xml.enabled true
-        html.enabled false
+        xml.required.set(true)
+        html.required.set(false)
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/edu/kit/scc/dem/wapsrv/app/CorsFilter.java

@@ -4,14 +4,14 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import org.eclipse.jetty.servlets.CrossOriginFilter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+import org.apache.jena.fuseki.servlets.CrossOriginFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/edu/kit/scc/dem/wapsrv/app/FusekiRunner.java

@@ -3,10 +3,10 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Vector;
-import javax.servlet.DispatcherType;
-import javax.servlet.FilterRegistration.Dynamic;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.FilterRegistration.Dynamic;
 import org.apache.jena.fuseki.main.FusekiServer;
-import org.eclipse.jetty.servlets.CrossOriginFilter;
+import org.apache.jena.fuseki.servlets.CrossOriginFilter;
 import org.apache.jena.tdb2.TDB2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -151,7 +151,7 @@ private void addCorsFilter(FusekiServer fusekiServer, boolean writeable) {
     * @return                A cross origin filter that enforces the given parameters
     */
    private CrossOriginFilter createCrossOriginFilter(final int maxAge, final String allowedHeaders,
-         final String exposedHeaders) {
+                                                     final String exposedHeaders) {
       // The jena/jetty implementation has some flaws we have to work around
       // Details are found within the CorsFilter class
       return new CorsFilter(maxAge, allowedHeaders, exposedHeaders);

src/main/java/edu/kit/scc/dem/wapsrv/app/WapServerConfig.java

@@ -7,7 +7,7 @@
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/edu/kit/scc/dem/wapsrv/controller/AnnotationController.java

@@ -2,7 +2,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/edu/kit/scc/dem/wapsrv/controller/BackupController.java

@@ -2,7 +2,7 @@
 
 import java.util.Arrays;
 import java.util.HashSet;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/edu/kit/scc/dem/wapsrv/controller/BasicController.java

@@ -1,6 +1,6 @@
 package edu.kit.scc.dem.wapsrv.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpMethod;
 
 /**

src/main/java/edu/kit/scc/dem/wapsrv/controller/CatchAllController.java

@@ -2,7 +2,7 @@
 
 import java.util.Hashtable;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.jetty.http.HttpMethod;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;

src/main/java/edu/kit/scc/dem/wapsrv/controller/ContainerController.java

@@ -5,7 +5,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/edu/kit/scc/dem/wapsrv/controller/JavadocController.java

@@ -1,6 +1,6 @@
 package edu.kit.scc.dem.wapsrv.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;

src/main/java/edu/kit/scc/dem/wapsrv/controller/PageController.java

@@ -1,6 +1,6 @@
 package edu.kit.scc.dem.wapsrv.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/edu/kit/scc/dem/wapsrv/controller/SimpleFolderServerController.java

@@ -8,7 +8,7 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.HashSet;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;

src/main/java/edu/kit/scc/dem/wapsrv/controller/WebClientController.java

@@ -1,6 +1,6 @@
 package edu.kit.scc.dem.wapsrv.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;

src/main/java/edu/kit/scc/dem/wapsrv/exceptions/WapResponseEntityExceptionHandler.java

@@ -1,7 +1,7 @@
 package edu.kit.scc.dem.wapsrv.exceptions;
 
 import java.util.Date;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;