CI env for Jenkins Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build new file mode 100644 index 0000000..32bf602 --- /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 0000000..1a6e6a6 --- /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 0000000..fcdaaab --- /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 a74d7fa..5973e47 100644 --- a/pom.xml +++ b/pom.xml
@@ -423,14 +423,14 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-logger-api</artifactId> - <version>3.0.0-M3</version> + <version>${surefire.version}</version> <!-- to get around bug https://github.com/junit-team/junit5/issues/1367 --> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-api</artifactId> - <version>3.0.0-M3</version> + <version>${surefire.version}</version> <optional>true</optional> </dependency> </dependencies> @@ -2146,7 +2146,7 @@ <slf4j.version>1.7.21</slf4j.version> <spring4.version>4.3.20.RELEASE</spring4.version> <spring5.version>5.1.5.RELEASE</spring5.version> - <surefire.version>3.0.0-M3</surefire.version> + <surefire.version>3.0.0-M5</surefire.version> <validation.impl.version>6.2.0.Final</validation.impl.version> <weld.version>2.2.14.Final</weld.version> <!-- 2.4.1 doesn't work - bv tests --> <weld3.version>3.1.7.SP1</weld3.version> @@ -2168,7 +2168,7 @@ <jaxrs.api.spec.version>2.1</jaxrs.api.spec.version> <jaxrs.api.impl.version>2.1.6</jaxrs.api.impl.version> <jetty.plugin.version>6.1.26</jetty.plugin.version> - <jetty.version>9.4.28.v20200408</jetty.version> + <jetty.version>9.4.42.v20210604</jetty.version> <jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version> <jsonb.api.version>1.0.2</jsonb.api.version> <jsonp.ri.version>1.1.6</jsonp.ri.version>
diff --git a/tests/integration/servlet-2.5-reload/pom.xml b/tests/integration/servlet-2.5-reload/pom.xml index 6407580..26c4139 100644 --- a/tests/integration/servlet-2.5-reload/pom.xml +++ b/tests/integration/servlet-2.5-reload/pom.xml
@@ -56,7 +56,7 @@ <artifactId>maven-failsafe-plugin</artifactId> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> </plugin> </plugins>