diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build new file mode 100644 index 0000000000..32bf602497 --- /dev/null +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -0,0 +1,46 @@ +pipeline { + agent none + + stages { + stage('Jersey build') { + parallel { + stage('JDK 8 ') { + agent any + tools { + jdk 'oracle-jdk8-latest' + maven 'apache-maven-latest' + } + steps { + sh ''' + bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh + ''' + } + } + stage('JDK 11 ') { + agent any + tools { + jdk 'openjdk-jdk11-latest' + maven 'apache-maven-latest' + } + steps { + sh ''' + bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh + ''' + } + } + stage('JDK 16 ') { + agent any + tools { + jdk 'openjdk-jdk16-latest' + maven 'apache-maven-latest' + } + steps { + sh ''' + bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh + ''' + } + } + } + } + } +} \ No newline at end of file diff --git a/etc/jenkins/jenkins_build.sh b/etc/jenkins/jenkins_build.sh new file mode 100644 index 0000000000..1a6e6a6aab --- /dev/null +++ b/etc/jenkins/jenkins_build.sh @@ -0,0 +1,3 @@ +#!/bin/bash -xe + +mvn -V -U -B clean install glassfish-copyright:check -Dcopyright.quiet=false -Dsurefire.systemPropertiesFile=${WORKSPACE}/etc/jenkins/systemPropertiesFile \ No newline at end of file diff --git a/etc/jenkins/systemPropertiesFile b/etc/jenkins/systemPropertiesFile new file mode 100644 index 0000000000..fcdaaab841 --- /dev/null +++ b/etc/jenkins/systemPropertiesFile @@ -0,0 +1 @@ +jersey.config.server.monitoring.collision.buffer.power=3 \ No newline at end of file diff --git a/pom.xml b/pom.xml index a74d7facf0..5973e47c0c 100644 --- a/pom.xml +++ b/pom.xml @@ -423,14 +423,14 @@ org.apache.maven.surefire surefire-logger-api - 3.0.0-M3 + ${surefire.version} true org.apache.maven.surefire surefire-api - 3.0.0-M3 + ${surefire.version} true @@ -2146,7 +2146,7 @@ 1.7.21 4.3.20.RELEASE 5.1.5.RELEASE - 3.0.0-M3 + 3.0.0-M5 6.2.0.Final 2.2.14.Final 3.1.7.SP1 @@ -2168,7 +2168,7 @@ 2.1 2.1.6 6.1.26 - 9.4.28.v20200408 + 9.4.42.v20210604 6.1.14 1.0.2 1.1.6 diff --git a/tests/integration/servlet-2.5-reload/pom.xml b/tests/integration/servlet-2.5-reload/pom.xml index 64075807ca..26c4139006 100644 --- a/tests/integration/servlet-2.5-reload/pom.xml +++ b/tests/integration/servlet-2.5-reload/pom.xml @@ -56,7 +56,7 @@ maven-failsafe-plugin - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin