Merge pull request #1 from payara/master

syncing fork

.github/CONTRIBUTING.md

@@ -102,6 +102,8 @@ In order to debug Payara, first build the server with your changes. Run it in de
 
 From within your IDE you can then attach a debugger to the default port of 9009.
 
+If you are working on changes to a single Payara module in Payara Server you can usually just build the modified module and then copy the updated jar file into the glassfish/modules directory in your Payara installation then restart the server to see your changes. There is no need to rerun the whole build to work on a single module. 
+
 ## Pushing issues to Github
 
 When you are finished working on your issue, add the files to your git with a comment describing the addressed issue via JIRA and/or the Github issue number:

.gitignore

@@ -12,15 +12,16 @@ target/
 *nbactions.xml
 .vscode/
 .idea
+.DS_Store
 gfbuild.log
 /nucleus/payara-modules/requesttracing-core/nbproject/
 nb-configuration.xml
 /appserver/tests/quicklook/classes/
 /appserver/tests/quicklook/dist/
 /appserver/tests/quicklook/test-output/
 /appserver/tests/quicklook/*.output
-/appserver/tests/quicklook/*.log
 /appserver/tests/quicklook/**/*.war
+*.log
 /nucleus/payara-modules/nucleus-microprofile/config-service/nbproject/
 appserver/extras/arquillian-containers/payara-common/dependency-reduced-pom.xml
 /nucleus/payara-modules/service-exemplar/nbproject/

Jenkinsfile

@@ -2,7 +2,6 @@
 // Jenkinsfile for building a PR and running a subset of tests against it
 def pom
 def DOMAIN_NAME
-def ASADMIN
 def payaraBuildNumber
 pipeline {
     options {
@@ -30,7 +29,8 @@ pipeline {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Building SRC  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                 sh """mvn -B -V -ff -e clean install -PQuickBuild \
                 -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/jre/lib/security/cacerts \
-                -Djavax.xml.accessExternalSchema=all -Dbuild.number=${payaraBuildNumber}"""
+                -Djavax.xml.accessExternalSchema=all -Dbuild.number=${payaraBuildNumber} \
+                -Dsurefire.rerunFailingTestsCount=2"""
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#    Built SRC   *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post{
@@ -52,14 +52,13 @@ pipeline {
                 -Dglassfish.home=\"${pwd()}/appserver/distributions/payara/target/stage/payara5/glassfish\" \
                 -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/jre/lib/security/cacerts \
                 -Djavax.xml.accessExternalSchema=all \
+                -Dsurefire.rerunFailingTestsCount=2 \
                 -f appserver/tests/quicklook/pom.xml"""
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
                 always {
                     teardownDomain()
-                }
-                unstable {
                     junit '**/target/surefire-reports/*.xml'
                 }
             }
@@ -81,14 +80,15 @@ pipeline {
         stage('Run EE8 Tests') {
             steps {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -Dsurefire.useFile=false -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/jre/lib/security/cacerts -Djavax.xml.accessExternalSchema=all -Dpayara.version=${pom.version} -Ppayara-server-remote"
+                sh "mvn -B -V -ff -e clean install -Dsurefire.useFile=false \
+                -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/jre/lib/security/cacerts \
+                -Djavax.xml.accessExternalSchema=all -Dpayara.version=${pom.version} \
+                -Dsurefire.rerunFailingTestsCount=2 -Ppayara-server-remote"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
                 always {
                     teardownDomain()
-                }
-                unstable {
                     junit '**/target/surefire-reports/*.xml'
                 }
             }
@@ -111,11 +111,11 @@ pipeline {
                 sh """mvn -B -V -ff -e clean install -Dsurefire.useFile=false \
                 -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/jre/lib/security/cacerts \
                 -Djavax.xml.accessExternalSchema=all -Dpayara.version=${pom.version} \
-                -Ppayara-server-managed,payara5"""
+                -Dsurefire.rerunFailingTestsCount=2 -Ppayara-server-managed,payara5"""
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
-                unstable {
+                always {
                     junit '**/target/surefire-reports/*.xml'
                 }
             }
@@ -141,21 +141,20 @@ pipeline {
                 -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/jre/lib/security/cacerts \
                 -Djavax.xml.accessExternalSchema=all -Dpayara.version=${pom.version} \
                 -Dpayara_domain=${DOMAIN_NAME} -Duse.cnHost=true \
-                -Ppayara-server-remote,stable,payara5"""
+                -Dsurefire.rerunFailingTestsCount=2 -Ppayara-server-remote,stable,payara5"""
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
                 always {
                     teardownDomain()
-                }
-                unstable {
                     junit '**/target/surefire-reports/*.xml'
                 }
             }
         }
     }
 }
-def void setupDomain() {
+
+void setupDomain() {
     echo '*#*#*#*#*#*#*#*#*#*#*#*#  Setting up tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
     script{
         ASADMIN = "./appserver/distributions/payara/target/stage/payara5/bin/asadmin"
@@ -165,7 +164,8 @@ def void setupDomain() {
     sh "${ASADMIN} start-domain ${DOMAIN_NAME}"
     sh "${ASADMIN} start-database --dbtype derby || true"
 }
-def void teardownDomain() {
+
+void teardownDomain() {
     echo 'tidying up after tests:'
     sh "${ASADMIN} stop-domain ${DOMAIN_NAME}"
     sh "${ASADMIN} stop-database --dbtype derby || true"

Jenkinsfile-MicroProfile

@@ -26,7 +26,8 @@ pipeline {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Building SRC  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                 sh """mvn -B -V -ff -e clean install -PQuickBuild \
                 -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/jre/lib/security/cacerts \
-                -Djavax.xml.accessExternalSchema=all -Dbuild.number=${payaraBuildNumber}"""
+                -Djavax.xml.accessExternalSchema=all -Dbuild.number=${payaraBuildNumber}\
+                -Dfailsafe.rerunFailingTestsCount=2"""
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#    Built SRC   *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post{
@@ -48,104 +49,114 @@ pipeline {
         stage('Run MicroProfile Config TCK') {
             steps {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running Config TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-Config/tck-runner/pom.xml -Ppayara-micro-managed,payara5 -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean verify -f MicroProfile-Config/tck-runner/pom.xml \
+                -Dfailsafe.rerunFailingTestsCount=2 -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran Config TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
-                unstable {
-                    junit '**/target/surefire-reports/*.xml'
+                always {
+                    junit '**/target/failsafe-reports/*.xml'
                 }
             }
         }
         stage('Run MicroProfile Fault Tolerance TCK') {
             steps {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running Fault Tolerance TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-Fault-Tolerance/tck-runner/pom.xml -Ppayara-micro-managed,payara5 -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean verify -f MicroProfile-Fault-Tolerance/tck-runner/pom.xml \
+                -Dfailsafe.rerunFailingTestsCount=2 -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran Fault Tolerance TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
-                unstable {
-                    junit '**/target/surefire-reports/*.xml'
+                always {
+                    junit '**/target/failsafe-reports/*.xml'
                 }
             }
         }
         stage('Run MicroProfile Health TCK') {
             steps {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Installing MP Health TCK Arquillian Extension  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-Health/payara-health-arquillian-extension/pom.xml -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean install -f MicroProfile-Health/tck-arquillian-extension/pom.xml \
+                -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Installed MP Health TCK Arquillian Extension  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running Health TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-Health/tck-runner/pom.xml -Ppayara-micro-managed,payara5 -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean verify -f MicroProfile-Health/tck-runner/pom.xml \
+                -Dfailsafe.rerunFailingTestsCount=2 -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran Health TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
-                unstable {
-                    junit '**/target/surefire-reports/*.xml'
+                always {
+                    junit '**/target/failsafe-reports/*.xml'
                 }
             }
         }
         stage('Run MicroProfile JWT-Auth TCK') {
             steps {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Installing MP JWT-Auth TCK Arquillian Extension  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-JWT-Auth/payara-jwt-auth-arquillian-extension/pom.xml -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean install -f MicroProfile-JWT-Auth/tck-arquillian-extension/pom.xml \
+                -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Installed MP JWT-Auth TCK Arquillian Extension  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running JWT-Auth TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-JWT-Auth/tck-runner/pom.xml -Ppayara-micro-managed,full,payara5 -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean verify -f MicroProfile-JWT-Auth/tck-runner/pom.xml \
+                -Dfailsafe.rerunFailingTestsCount=2 -Punstable -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran JWT-Auth TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
-                unstable {
-                    junit '**/target/surefire-reports/*.xml'
+                always {
+                    junit '**/target/failsafe-reports/*.xml'
                 }
             }
         }
         stage('Run MicroProfile Metrics TCK') {
             steps {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running Metrics TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-Metrics/tck-runner/pom.xml -Ppayara-micro-managed,payara5 -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean verify -f MicroProfile-Metrics/tck-runner/pom.xml \
+                -Dfailsafe.rerunFailingTestsCount=2 -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran Metrics TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
-                unstable {
-                    junit '**/target/surefire-reports/*.xml'
+                always {
+                    junit '**/target/failsafe-reports/*.xml'
                 }
             }
         }
         stage('Run MicroProfile OpenAPI TCK') {
             steps {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running OpenAPI TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-OpenAPI/tck-runner/pom.xml -Ppayara-micro-managed,payara5 -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean verify -f MicroProfile-OpenAPI/tck-runner/pom.xml \
+                -Dfailsafe.rerunFailingTestsCount=2 -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran OpenAPI TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
-                unstable {
-                    junit '**/target/surefire-reports/*.xml'
+                always {
+                    junit '**/target/failsafe-reports/*.xml'
                 }
             }
         }
         stage('Run MicroProfile OpenTracing TCK') {
             steps {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running OpenTracing TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-OpenTracing/tck-runner/pom.xml -Ppayara-micro-managed,payara5 -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean verify -f MicroProfile-OpenTracing/tck-runner/pom.xml \
+                -Dfailsafe.rerunFailingTestsCount=2 -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran OpenTracing TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
-                unstable {
-                    junit '**/target/surefire-reports/*.xml'
+                always {
+                    junit '**/target/failsafe-reports/*.xml'
                 }
             }
         }
         stage('Run MicroProfile Rest Client TCK') {
             steps {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running Rest Client TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-                sh "mvn -B -V -ff -e clean install -f MicroProfile-Rest-Client/tck-runner/pom.xml -Ppayara-micro-managed,payara5 -Dpayara.version=${pom.version}"
+                sh "mvn -B -V -ff -e clean verify -f MicroProfile-Rest-Client/tck-runner/pom.xml \
+                -Dfailsafe.rerunFailingTestsCount=2 -Dpayara.version=${pom.version}"
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran Rest Client TCK  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {
-                unstable {
-                    junit '**/target/surefire-reports/*.xml'
+                always {
+                    junit '**/target/failsafe-reports/*.xml'
                 }
             }
         }