[java-idp-integration-tests] branch main updated: Default to Jetty 12

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch main
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=f0928dea14740ec8fe7c503dff38c110765cfb90

The following commit(s) were added to refs/heads/main by this push:
     new f0928de  Default to Jetty 12
f0928de is described below

commit f0928dea14740ec8fe7c503dff38c110765cfb90
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Sep 5 19:15:41 2024 -0500

    Default to Jetty 12
---
 pom.xml                                         | 15 ++-----------
 src/jenkins/trigger-integration-v17.jenkinsfile | 28 ++++---------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index 79bf9ef..56db7e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,8 @@
         <idp-to-be-tested.version>${idp.version}</idp-to-be-tested.version>
 
         <!-- Jetty -->
-        <jetty.version>11.0.22</jetty.version>
-        <idp-jetty-base.version>11.0.0-SNAPSHOT</idp-jetty-base.version>
+        <jetty.version>12.0.12</jetty.version>
+        <idp-jetty-base.version>12.0.0-SNAPSHOT</idp-jetty-base.version>
 
         <!-- Tomcat -->
         <tomcat.version>10.1.25</tomcat.version>
@@ -350,17 +350,6 @@
             </properties>
         </profile>
 
-        <!--
-        The jetty-12 profile tests Jetty 12
-        -->
-        <profile>
-            <id>jetty-12</id>
-            <properties>
-                <jetty.version>12.0.11</jetty.version>
-                <idp-jetty-base.version>12.0.0-SNAPSHOT</idp-jetty-base.version>
-            </properties>
-        </profile>
-
         <!--
         The jetty profile unpacks Jetty, idp-jetty-base, and adds the testbed to Jetty.
         The jetty profile is active by default and not active if the 'tomcat' system property is present.
diff --git a/src/jenkins/trigger-integration-v17.jenkinsfile b/src/jenkins/trigger-integration-v17.jenkinsfile
index 3242208..3a2fc70 100644
--- a/src/jenkins/trigger-integration-v17.jenkinsfile
+++ b/src/jenkins/trigger-integration-v17.jenkinsfile
@@ -10,14 +10,9 @@ pipeline {
     }
     stages {
         // IdP V5 snapshot
-        stage('Test IdP V5 snapshot with Jetty 11 on Linux') {
-            steps {
-                build job: "java-idp-integration-tests-v5-linux-jetty", wait: true
-            }
-        }
         stage('Test IdP V5 snapshot with Jetty 12 on Linux') {
             steps {
-                build job: "java-idp-integration-tests-v5-linux-jetty-12", wait: true
+                build job: "java-idp-integration-tests-v5-linux-jetty", wait: true
             }
         }
         stage('Test IdP V5 snapshot with Tomcat 10.1 on Linux') {
@@ -25,25 +20,15 @@ pipeline {
                 build job: "java-idp-integration-tests-v5-linux-tomcat", wait: true
             }
         }
-        stage('Test IdP V5 snapshot with Jetty 11 on Windows') {
-            steps {
-                build job: "java-idp-integration-tests-v5-windows-jetty", wait: true
-            }
-        }
         stage('Test IdP V5 snapshot with Jetty 12 on Windows') {
             steps {
-                build job: "java-idp-integration-tests-v5-windows-jetty-12", wait: true
+                build job: "java-idp-integration-tests-v5-windows-jetty", wait: true
             }
         }
         // IdP V5.1.3
-        stage('Test IdP V5.1.3 with Jetty 11 on Linux') {
-            steps {
-                build job: "java-idp-integration-tests-v5.1.3-linux-jetty", wait: true
-            }
-        }
         stage('Test IdP V5.1.3 with Jetty 12 on Linux') {
             steps {
-                build job: "java-idp-integration-tests-v5.1.3-linux-jetty-12", wait: true
+                build job: "java-idp-integration-tests-v5.1.3-linux-jetty", wait: true
             }
         }
         stage('Test IdP V5.1.3 with Tomcat 10.1 on Linux') {
@@ -51,14 +36,9 @@ pipeline {
                 build job: "java-idp-integration-tests-v5.1.3-linux-tomcat", wait: true
             }
         }
-        stage('Test IdP V5.1.3 with Jetty 11 on Windows') {
-            steps {
-                build job: "java-idp-integration-tests-v5.1.3-windows-jetty", wait: true
-            }
-        }
         stage('Test IdP V5.1.3 with Jetty 12 on Windows') {
             steps {
-                build job: "java-idp-integration-tests-v5.1.3-windows-jetty-12", wait: true
+                build job: "java-idp-integration-tests-v5.1.3-windows-jetty", wait: true
             }
         }
     }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.