From 434e9da2df452d3d33a352d00776342800feeed8 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 21 Aug 2023 20:46:08 +1000
Subject: [PATCH] arquillian jetty 2.0.0 final

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 .github/workflows/maven.yml | 31 +++++++++++++++++-----------
 Jenkinsfile                 | 40 ++++++++++++++++++-------------------
 pom.xml                     |  2 +-
 3 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index d0ff981..66a9094 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -37,11 +37,27 @@ jobs:
 
     steps:
 
-      - name: Checkout Arquillian
+#      - name: Checkout Arquillian
+#        uses: actions/checkout@v3
+#        with:
+#          repository: 'arquillian/arquillian-container-jetty'
+#          ref: 'master'
+#
+#      - name: Set up JDK
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: 17
+#          distribution: 'temurin'
+#          cache: 'maven'
+#
+#      - name: Build Arquillian with Maven
+#        run: mvn install -B -U
+
+      - name: Checkout Servlet TCK
         uses: actions/checkout@v3
         with:
-          repository: 'arquillian/arquillian-container-jetty'
-          ref: 'master'
+          repository: 'olamy/jakartaee-tck'
+          ref: 'tckrefactor'
 
       - name: Set up JDK
         uses: actions/setup-java@v3
@@ -50,15 +66,6 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Build Arquillian with Maven
-        run: mvn install -B -U
-
-      - name: Checkout Servlet TCK
-        uses: actions/checkout@v3
-        with:
-          repository: 'olamy/jakartaee-tck'
-          ref: 'tckrefactor'
-
       - name: Install legacy javatest jar
         run: mvn  -ntp install:install-file -Dfile=./lib/javatest.jar -DgroupId=javatest -DartifactId=javatest -Dversion=5.0 -Dpackaging=jar
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 24fd69b..6049feb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,26 +64,26 @@ pipeline {
             }
           }
         }
-        stage("Checkout Build Arquillian Jetty") {
-          steps {
-            ws('arquillian') {
-              deleteDir()
-              checkout([$class: 'GitSCM',
-                        branches: [[name: "*/$ARQUILLIAN_JETTY_BRANCH"]],
-                        extensions: [[$class: 'CloneOption', depth: 1, noTags: true, shallow: true]],
-                        userRemoteConfigs: [[url: 'https://github.com/${GITHUB_ORG_ARQUILLIAN}/arquillian-container-jetty']]])
-              timeout(time: 30, unit: 'MINUTES') {
-                withEnv(["JAVA_HOME=${tool "$JDKBUILD"}",
-                         "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool "maven3"}/bin",
-                         "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
-                  configFileProvider([configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
-                    sh "mvn --no-transfer-progress -s $GLOBAL_MVN_SETTINGS -V -B -U clean install -DskipTests -T3 -e -Denforcer.skip=true"
-                  }
-                }
-              }
-            }
-          }
-        }
+//        stage("Checkout Build Arquillian Jetty") {
+//          steps {
+//            ws('arquillian') {
+//              deleteDir()
+//              checkout([$class: 'GitSCM',
+//                        branches: [[name: "*/$ARQUILLIAN_JETTY_BRANCH"]],
+//                        extensions: [[$class: 'CloneOption', depth: 1, noTags: true, shallow: true]],
+//                        userRemoteConfigs: [[url: 'https://github.com/${GITHUB_ORG_ARQUILLIAN}/arquillian-container-jetty']]])
+//              timeout(time: 30, unit: 'MINUTES') {
+//                withEnv(["JAVA_HOME=${tool "$JDKBUILD"}",
+//                         "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool "maven3"}/bin",
+//                         "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
+//                  configFileProvider([configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
+//                    sh "mvn --no-transfer-progress -s $GLOBAL_MVN_SETTINGS -V -B -U clean install -DskipTests -T3 -e -Denforcer.skip=true"
+//                  }
+//                }
+//              }
+//            }
+//          }
+//        }
 
       //}
     //}
diff --git a/pom.xml b/pom.xml
index c52ebf0..85b4ebd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <junit.version>5.10.0</junit.version>
     <slf4j.version>2.0.7</slf4j.version>
     <arquillian.core.version>1.7.0.Alpha14</arquillian.core.version> <!-- 1.7.0.Final-SNAPSHOT -->
-    <arquillian.jetty.version>2.0.0.Final-SNAPSHOT</arquillian.jetty.version>
+    <arquillian.jetty.version>2.0.0.Final</arquillian.jetty.version>
     <arquillian.jetty.artifactId>arquillian-jetty-embedded-12-ee9</arquillian.jetty.artifactId>
     <jetty.version>12.0.0</jetty.version> <!-- 11.0.9-SNAPSHOT -->
     <surefire.version>3.1.0</surefire.version> <!-- 3.0.0-M7-SNAPSHOT -->