diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a31b060..5770618 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -39,21 +39,25 @@ jobs:
steps:
- # - name: Checkout Arquillian
- # uses: actions/checkout@v4
- # with:
- # repository: 'arquillian/arquillian-container-jetty'
- # ref: 'master'
-
- # - name: Set up JDK
- # uses: actions/setup-java@v4
- # with:
- # java-version: 17
- # distribution: 'temurin'
- # cache: 'maven'
-
- # - name: Build Arquillian with Maven
- # run: mvn install -B -U
+ - name: Checkout Arquillian
+ uses: actions/checkout@v4
+ with:
+ repository: 'arquillian/arquillian-container-jetty'
+ ref: 'master'
+
+ - name: Set up JDK
+ uses: actions/setup-java@v4
+ with:
+ java-version: 17
+ distribution: 'temurin'
+ cache: 'maven'
+
+ - name: Set up Maven
+ run:
+ mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=3.9.5
+
+ - name: Build Arquillian with Maven
+ run: ./mvnw install -B -U
- name: Checkout Servlet TCK
uses: actions/checkout@v4
diff --git a/Jenkinsfile b/Jenkinsfile
index e461576..244ec8b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -70,26 +70,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 -ntp -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 -ntp -s $GLOBAL_MVN_SETTINGS -V -B -U clean install -DskipTests -T3 -e -Denforcer.skip=true"
+ }
+ }
+ }
+ }
+ }
+ }
}
diff --git a/pom.xml b/pom.xml
index f066459..f746437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,9 @@
11
5.10.1
2.0.9
- 2.0.0.Final
+ 2.0.1.Final-SNAPSHOT
arquillian-jetty-embedded-12-ee9
- 12.0.2-SNAPSHOT
+ 12.0.6-SNAPSHOT
3.2.5
6.1.0-SNAPSHOT
6.0.0
diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
index 5cdd97e..4ce6f97 100644
--- a/src/test/resources/arquillian.xml
+++ b/src/test/resources/arquillian.xml
@@ -25,6 +25,9 @@
text/html iso-8859-1
true
+
+ relativeRedirectAllowed false
+
@@ -49,6 +52,9 @@
false
false
true
+
+ relativeRedirectAllowed false
+