build with arquillian snapshot

Signed-off-by: Olivier Lamy <[email protected]>
jetty-project · Jan 29, 2024 · 09e9cb1 · 09e9cb1
1 parent c655267
commit 09e9cb1
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 44 deletions.
diff --git 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: 'olamy/arquillian-container-jetty'
+          ref: 'dynamic-httpconfiguration-properties'
+
+      - 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
@@ -29,7 +29,7 @@ pipeline {
             name: 'GITHUB_ORG_ARQUILLIAN',
             choices: ['arquillian','olamy'] )
 
-    string( defaultValue: 'master', description: 'GIT branch name to build arquillian Jetty (master/tck-all-changes)',
+    string( defaultValue: 'dynamic-httpconfiguration-properties', description: 'GIT branch name to build arquillian Jetty (master/tck-all-changes)',
             name: 'ARQUILLIAN_JETTY_BRANCH' )
 
     string( defaultValue: 'jdk17', description: 'JDK to build Jetty', name: 'JDKBUILD' )
@@ -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
@@ -16,9 +16,9 @@
     <maven.compiler.release>11</maven.compiler.release>
     <junit.version>5.10.1</junit.version>
     <slf4j.version>2.0.9</slf4j.version>
-    <arquillian.jetty.version>2.0.0.Final</arquillian.jetty.version>
+    <arquillian.jetty.version>2.0.1.Final-SNAPSHOT</arquillian.jetty.version>
     <arquillian.jetty.artifactId>arquillian-jetty-embedded-12-ee10</arquillian.jetty.artifactId>
-    <jetty.version>12.0.4-SNAPSHOT</jetty.version> <!-- 11.0.9-SNAPSHOT -->
+    <jetty.version>12.0.6-SNAPSHOT</jetty.version> <!-- 11.0.9-SNAPSHOT -->
     <surefire.version>3.2.5</surefire.version>
     <jakarta.tck.version>6.1.0-SNAPSHOT</jakarta.tck.version>
     <servlet.api.version>6.0.0</servlet.api.version>
@@ -312,7 +312,7 @@
                   <groupId>jakarta.servlet</groupId>
                   <artifactId>tck-runtime</artifactId>
                   <type>jar</type>
-                  <overWrite>false</overWrite>
+                  <overWrite>true</overWrite>
                   <outputDirectory>${project.build.testOutputDirectory}/</outputDirectory>
                   <includes>**/**cts_cert,**/**clientcert.jks,**/**clientcert.p12</includes>
                 </artifactItem>

diff --git a/src/test/java/org/eclipse/jetty/tck/AppTest.java b/src/test/java/org/eclipse/jetty/tck/AppTest.java
@@ -5,20 +5,23 @@
 import servlet.tck.api.jakarta_servlet.dispatchtest.DispatchTests;
 import servlet.tck.api.jakarta_servlet.servletrequest.ServletRequestTests;
 import servlet.tck.api.jakarta_servlet_http.httpsessionx.HttpSessionxTests;
+import servlet.tck.pluggability.api.jakarta_servlet_http.httpservletresponse.HttpServletResponseTests;
+import servlet.tck.spec.security.secform.SecFormTests;
 
 /**
  * Unit test for simple App.
  */
 @Disabled
-public class AppTest extends DispatchTests
+public class AppTest extends SecFormTests
 
 {
 
     @Test
     public void foo() throws Exception {
-        System.setProperty("servlet.tck.support.crossContext", "false");
-        //super.invalidateHttpSessionTest();
-        super.negativeDispatchTest9();
+//        System.setProperty("servlet.tck.support.crossContext", "false");
+//        //super.invalidateHttpSessionTest();
+//        super.flushBufferTest();
+        super.test6_anno();
     }
 
 }
diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns="http://jboss.org/schema/arquillian"
-            xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+            xsi:schemaLocation="http://jboss.org/schema/arquillian https://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
   <engine>
     <!-- property name="deploymentExportPath">target/</property -->
@@ -22,6 +22,9 @@
           text/html iso-8859-1
         </property>
         <property name="h2cEnabled">true</property>
+        <property name="httpConfigurationProperties">
+          relativeRedirectAllowed false
+        </property>
       </configuration>
     </container>
 
@@ -46,6 +49,10 @@
         <property name="sniRequired">false</property>
         <property name="sniHostCheck">false</property>
         <property name="h2cEnabled">true</property>
+        <property name="relativeRedirectAllowed">false</property>
+        <property name="HttpConfiguration">
+          relativeRedirectAllowed false
+        </property>
       </configuration>
     </container>
   </group>