diff --git a/Jenkinsfile b/Jenkinsfile index a3ae5133ae3..a8c14a84e1b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,12 +7,12 @@ pipeline { stages { stage("Parallel Stage") { parallel { - stage("Build / Test - JDK11") { + stage("Build / Test - JDK17") { agent { node { label 'linux' } } steps { container('jetty-build') { timeout( time: 120, unit: 'MINUTES' ) { - mavenBuild( "jdk11", "clean install -Perrorprone", "maven3") + mavenBuild( "jdk17", "clean install", "maven3") // Collect up the jacoco execution results (only on main build) jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class', exclusionPattern: '' + @@ -31,19 +31,19 @@ pipeline { execPattern: '**/target/jacoco.exec', classPattern: '**/target/classes', sourcePattern: '**/src/main/java' - recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser(), errorProne()] + recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle()] } } } } - stage("Build / Test - JDK17") { + stage("Build / Test - JDK11") { agent { node { label 'linux' } } steps { container( 'jetty-build' ) { timeout( time: 120, unit: 'MINUTES' ) { - mavenBuild( "jdk17", "clean install -Dspotbugs.skip=true -Djacoco.skip=true", "maven3") - recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser()] + mavenBuild( "jdk11", "clean install -Dspotbugs.skip=true -Djacoco.skip=true -Perrorprone", "maven3") + recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), errorProne()] } } } diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 8d9ea4a9891..f1ee1b1d02a 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -14,7 +14,6 @@ ${project.build.directory}/jetty-sources true - true true true @@ -109,6 +108,10 @@ infinispan-remote, jetty-test-helper, alpn-api, + quic-quiche, + quic-quiche-common, + quic-quiche-foreign-incubator, + quic-quiche-jna, javax.servlet, javax.websocket, jetty-servlet-api, @@ -148,8 +151,6 @@ org.eclipse.jetty.http3.qpack.internal.*; org.eclipse.jetty.http3.server.internal; org.eclipse.jetty.quic.common.internal; - org.eclipse.jetty.quic.quiche; - org.eclipse.jetty.quic.quiche.*; org.eclipse.jetty.quic.server.internal; diff --git a/pom.xml b/pom.xml index 7cc01c313a7..ac43330a614 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 3.0.0-M1 3.2.2 3.2.2 - 3.3.1 + 3.3.2 3.1.1 3.6.4 3.6.4 @@ -2237,8 +2237,8 @@ - [11,) - [ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 11 or newer + [17,) + [ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 17 or newer @@ -2353,7 +2353,6 @@ true - true