upgrade java and spring

Dockerfile

@@ -1,3 +1,3 @@
-FROM openjdk:11
+FROM openjdk:21-jdk
 ADD ./build/libs/web-parser-rest.jar /app.jar
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xmx1g","-Xlog:gc","-XX:+HeapDumpOnOutOfMemoryError","-XX:HeapDumpPath=/log/java_pid%p.hprof","-Dlogging.config=classpath:logback-docker.xml","-jar","/app.jar"]

build.gradle

@@ -1,22 +1,26 @@
 plugins {
-    id 'org.springframework.boot' version '2.1.6.RELEASE'
+    id 'org.springframework.boot' version '3.3.0'
     id 'java'
 }
 apply plugin: 'jacoco'
-
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group 'squote'
-version = '2.0.2'
-sourceCompatibility = 11
-targetCompatibility = 11
+version = '2.0.3'
 
 bootJar {
-    archiveName = 'web-parser-rest.jar'
+    archiveFileName = 'web-parser-rest.jar'
 }
 
 jacoco {
-    toolVersion = "0.8.4"
+    toolVersion = '0.8.12'
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
 repositories {
@@ -25,34 +29,31 @@ repositories {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-cache'
     implementation 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4'
-    implementation group: 'org.jsoup', name: 'jsoup', version: '1.12.1'
+    implementation group: 'org.jsoup', name: 'jsoup', version: '1.15.3'
     implementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.6.0'
     implementation 'com.github.ben-manes.caffeine:caffeine:2.7.0'
-    implementation group: 'io.projectreactor.addons', name: 'reactor-extra', version: '3.2.3.RELEASE'
+    implementation group: 'io.projectreactor.addons', name: 'reactor-extra', version: '3.5.1'
+    implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
-    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.2'
+    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
-    implementation group: 'commons-io', name: 'commons-io', version: '2.5'
-    implementation group: 'com.google.guava', name: 'guava', version: '19.0'
-
-    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jdk8'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.7'
+    implementation group: 'com.google.guava', name: 'guava', version: '32.0.0-android'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.projectreactor:reactor-test'
-    testImplementation group: 'org.springframework', name: 'springloaded', version: '1.2.6.RELEASE'
-
-
+    testImplementation 'junit:junit:4.13'
 }
 
 test {
     testLogging.showStandardStreams = true
 }
 
 jacocoTestReport {
+    dependsOn test
     reports {
-        xml.enabled false
-        html.enabled true
+        xml.required = false
+        html.required = true
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/thc/WebParserRestApplication.java

@@ -3,6 +3,7 @@
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+import jakarta.annotation.PostConstruct;
 import org.asynchttpclient.AsyncHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,7 +25,6 @@
 import thc.service.JsoupParseService;
 import thc.service.RestParseService;
 
-import javax.annotation.PostConstruct;
 import javax.net.ssl.SSLException;
 
 import static org.asynchttpclient.Dsl.asyncHttpClient;

src/main/java/thc/service/JsoupParseService.java

@@ -21,15 +21,15 @@ public <T> Mono<T> process(JsoupParseRequest<T> parser) {
             setHeaders(connection, parser.headers());
             return parser.parseResponse(connection.get());
     })
-                .subscribeOn(Schedulers.elastic())
+                .subscribeOn(Schedulers.boundedElastic())
                 .onErrorResume((e) -> {
             log.warn("Error when process jsoup request: {}, {}", e.toString(), parser.url());
             return Mono.just(parser.defaultValue());
         });
     }
 
     private void setHeaders(Connection connection, Map<String, String> headers) {
-        headers.entrySet().forEach((e) -> connection.header(e.getKey(), e.getValue()));
+        headers.forEach(connection::header);
     }