Merge pull request #3 from tls-attacker/java21

ic0ns · web-flow · commit 6fb4af03da24 · 2025-05-05T15:03:05.000+04:00
Java21 and new BOM
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,8 +2,8 @@ pipeline {
     agent any
 
     environment {
-        JDK_TOOL_NAME = 'JDK 11'
-        MAVEN_TOOL_NAME = 'Maven 3.8.6'
+        JDK_TOOL_NAME = 'JDK 21'
+        MAVEN_TOOL_NAME = 'Maven 3.9.9'
     }
 
     options {
@@ -48,7 +48,7 @@ pipeline {
         stage('Code Analysis') {
             when {
                 anyOf {
-                    branch 'master'
+                    branch 'main'
                     tag 'v*'
                     changeRequest()
                 }
@@ -58,7 +58,7 @@ pipeline {
             }
             steps {
                 withMaven(jdk: env.JDK_TOOL_NAME, maven: env.MAVEN_TOOL_NAME) {
-                    sh 'mvn pmd:pmd pmd:cpd spotbugs:spotbugs'
+                    sh 'mvn -DskipTests=true package pmd:pmd pmd:cpd spotbugs:spotbugs'
                 }
             }
             post {
@@ -70,7 +70,7 @@ pipeline {
         stage('Unit Tests') {
             when {
                 anyOf {
-                    branch 'master'
+                    branch 'main'
                     tag 'v*'
                     changeRequest()
                 }
@@ -92,13 +92,13 @@ pipeline {
         stage('Integration Tests') {
             when {
                 anyOf {
-                    branch 'master'
+                    branch 'main'
                     tag 'v*'
                     changeRequest()
                 }
             }
             options {
-                timeout(activity: true, time: 120, unit: 'SECONDS')
+                timeout(activity: true, time: 1800, unit: 'SECONDS')
             }
             steps {
                 withMaven(jdk: env.JDK_TOOL_NAME, maven: env.MAVEN_TOOL_NAME) {
@@ -110,14 +110,17 @@ pipeline {
                     junit testResults: '**/target/failsafe-reports/TEST-*.xml', allowEmptyResults: true
                 }
                 success {
-                    publishCoverage adapters: [jacoco(mergeToOneReport: true, path: '**/target/site/jacoco/jacoco.xml')]
+                    discoverReferenceBuild()
+                    recordCoverage(tools: [[ parser: 'JACOCO' ]],
+                            id: 'jacoco', name: 'JaCoCo Coverage',
+                            sourceCodeRetention: 'LAST_BUILD')
                 }
             }
         }
         stage('Deploy Jar to Internal Nexus Repository') {
             when {
                 anyOf {
-                    branch 'master'
+                    branch 'main'
                     tag 'v*'
                 }
             }
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds</groupId>
         <artifactId>protocol-toolkit-bom</artifactId>
-        <version>4.4.0</version>
+        <version>5.2.0</version>
     </parent>
 
     <artifactId>crawler-core</artifactId>
@@ -80,8 +80,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <!-- The following variables are required for Jenkins CI -->
         <skipTests>false</skipTests>
         <skip.surefire.tests>${skipTests}</skip.surefire.tests>
@@ -222,11 +222,11 @@
                             <spacesPerTab>4</spacesPerTab>
                         </indent>
                         <googleJavaFormat>
-                            <version>1.15.0</version>
+                            <version>1.25.2</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                         <licenseHeader>
-                            <file>${project.basedir}/license_header_plain.txt</file>
+                            <file>${basedir}/license_header_plain.txt</file>
                         </licenseHeader>
                     </java>
                 </configuration>
diff --git a/src/main/java/de/rub/nds/crawler/core/jobs/PublishBulkScanJob.java b/src/main/java/de/rub/nds/crawler/core/jobs/PublishBulkScanJob.java
@@ -78,16 +78,22 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
             long submittedJobs = parsedJobStatuses.getOrDefault(JobStatus.TO_BE_EXECUTED, 0L);
             long unresolvedJobs = parsedJobStatuses.getOrDefault(JobStatus.UNRESOLVABLE, 0L);
             long denylistedJobs = parsedJobStatuses.getOrDefault(JobStatus.DENYLISTED, 0L);
-            long resolutionErrorJobs = parsedJobStatuses.getOrDefault(JobStatus.RESOLUTION_ERROR, 0L);
+            long resolutionErrorJobs =
+                    parsedJobStatuses.getOrDefault(JobStatus.RESOLUTION_ERROR, 0L);
             bulkScan.setScanJobsPublished(submittedJobs);
-            bulkScan.setScanJobsResolutionErrors(unresolvedJobs+resolutionErrorJobs);
+            bulkScan.setScanJobsResolutionErrors(unresolvedJobs + resolutionErrorJobs);
             bulkScan.setScanJobsDenylisted(denylistedJobs);
             persistenceProvider.updateBulkScan(bulkScan);
 
             if (controllerConfig.isMonitored() && submittedJobs == 0) {
                 progressMonitor.stopMonitoringAndFinalizeBulkScan(bulkScan.get_id());
             }
-            LOGGER.info("Submitted {} scan jobs to RabbitMq (Not submitted: {} Unresolvable, {} Denylisted, {} unhandled Error)", submittedJobs,unresolvedJobs, denylistedJobs, resolutionErrorJobs);
+            LOGGER.info(
+                    "Submitted {} scan jobs to RabbitMq (Not submitted: {} Unresolvable, {} Denylisted, {} unhandled Error)",
+                    submittedJobs,
+                    unresolvedJobs,
+                    denylistedJobs,
+                    resolutionErrorJobs);
         } catch (Exception e) {
             LOGGER.error("Exception while publishing BulkScan: ", e);
             JobExecutionException e2 = new JobExecutionException(e);
@@ -124,17 +130,21 @@ public JobStatus apply(String targetString) {
                 var targetInfo =
                         ScanTarget.fromTargetString(targetString, defaultPort, denylistProvider);
                 jobDescription =
-                        new ScanJobDescription(targetInfo.getLeft(), bulkScan, targetInfo.getRight());
-            }catch (Exception e){
-                jobDescription = new ScanJobDescription(new ScanTarget(), bulkScan, JobStatus.RESOLUTION_ERROR);
+                        new ScanJobDescription(
+                                targetInfo.getLeft(), bulkScan, targetInfo.getRight());
+            } catch (Exception e) {
+                jobDescription =
+                        new ScanJobDescription(
+                                new ScanTarget(), bulkScan, JobStatus.RESOLUTION_ERROR);
                 errorResult = ScanResult.fromException(jobDescription, e);
-                LOGGER.error("Error while creating ScanJobDescription for target '{}'", targetString, e);
+                LOGGER.error(
+                        "Error while creating ScanJobDescription for target '{}'", targetString, e);
             }
 
             if (jobDescription.getStatus() == JobStatus.TO_BE_EXECUTED) {
                 orchestrationProvider.submitScanJob(jobDescription);
             } else {
-                if(errorResult == null){
+                if (errorResult == null) {
                     errorResult = new ScanResult(jobDescription, null);
                 }
                 persistenceProvider.insertScanResult(errorResult, jobDescription);
diff --git a/src/main/java/de/rub/nds/crawler/targetlist/TargetFileProvider.java b/src/main/java/de/rub/nds/crawler/targetlist/TargetFileProvider.java
@@ -33,8 +33,9 @@ public List<String> getTargetList() {
         List<String> targetList;
         try (Stream<String> lines = Files.lines(Paths.get(filename))) {
             // remove comments and empty lines
-            targetList = lines.filter(line -> !(line.startsWith("#") || line.isEmpty()))
-                    .collect(Collectors.toList());
+            targetList =
+                    lines.filter(line -> !(line.startsWith("#") || line.isEmpty()))
+                            .collect(Collectors.toList());
         } catch (IOException ex) {
             throw new RuntimeException("Could not load " + filename, ex);
         }

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ pipeline {`
`2`	`2`	`agent any`
`3`	`3`
`4`	`4`	`environment {`
`5`		`- JDK_TOOL_NAME = 'JDK 11'`
`6`		`- MAVEN_TOOL_NAME = 'Maven 3.8.6'`
	`5`	`+ JDK_TOOL_NAME = 'JDK 21'`
	`6`	`+ MAVEN_TOOL_NAME = 'Maven 3.9.9'`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`options {`
`@@ -48,7 +48,7 @@ pipeline {`
`48`	`48`	`stage('Code Analysis') {`
`49`	`49`	`when {`
`50`	`50`	`anyOf {`
`51`		`- branch 'master'`
	`51`	`+ branch 'main'`
`52`	`52`	`tag 'v*'`
`53`	`53`	`changeRequest()`
`54`	`54`	`}`
`@@ -58,7 +58,7 @@ pipeline {`
`58`	`58`	`}`
`59`	`59`	`steps {`
`60`	`60`	`withMaven(jdk: env.JDK_TOOL_NAME, maven: env.MAVEN_TOOL_NAME) {`
`61`		`- sh 'mvn pmd:pmd pmd:cpd spotbugs:spotbugs'`
	`61`	`+ sh 'mvn -DskipTests=true package pmd:pmd pmd:cpd spotbugs:spotbugs'`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`post {`
`@@ -70,7 +70,7 @@ pipeline {`
`70`	`70`	`stage('Unit Tests') {`
`71`	`71`	`when {`
`72`	`72`	`anyOf {`
`73`		`- branch 'master'`
	`73`	`+ branch 'main'`
`74`	`74`	`tag 'v*'`
`75`	`75`	`changeRequest()`
`76`	`76`	`}`
`@@ -92,13 +92,13 @@ pipeline {`
`92`	`92`	`stage('Integration Tests') {`
`93`	`93`	`when {`
`94`	`94`	`anyOf {`
`95`		`- branch 'master'`
	`95`	`+ branch 'main'`
`96`	`96`	`tag 'v*'`
`97`	`97`	`changeRequest()`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`options {`
`101`		`- timeout(activity: true, time: 120, unit: 'SECONDS')`
	`101`	`+ timeout(activity: true, time: 1800, unit: 'SECONDS')`
`102`	`102`	`}`
`103`	`103`	`steps {`
`104`	`104`	`withMaven(jdk: env.JDK_TOOL_NAME, maven: env.MAVEN_TOOL_NAME) {`
`@@ -110,14 +110,17 @@ pipeline {`
`110`	`110`	`junit testResults: '*/target/failsafe-reports/TEST-.xml', allowEmptyResults: true`
`111`	`111`	`}`
`112`	`112`	`success {`
`113`		`- publishCoverage adapters: [jacoco(mergeToOneReport: true, path: '**/target/site/jacoco/jacoco.xml')]`
	`113`	`+ discoverReferenceBuild()`
	`114`	`+ recordCoverage(tools: [[ parser: 'JACOCO' ]],`
	`115`	`+ id: 'jacoco', name: 'JaCoCo Coverage',`
	`116`	`+ sourceCodeRetention: 'LAST_BUILD')`
`114`	`117`	`}`
`115`	`118`	`}`
`116`	`119`	`}`
`117`	`120`	`stage('Deploy Jar to Internal Nexus Repository') {`
`118`	`121`	`when {`
`119`	`122`	`anyOf {`
`120`		`- branch 'master'`
	`123`	`+ branch 'main'`
`121`	`124`	`tag 'v*'`
`122`	`125`	`}`
`123`	`126`	`}`