[java-idp-testbed] branch main updated: Move testbed to 12.1 and add missing Jetty runtime deps.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-idp-testbed.

View the commit online:
https://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=87c293f1f89bdee31d9c2a70dc86505313f0207d

The following commit(s) were added to refs/heads/main by this push:
     new 87c293f  Move testbed to 12.1 and add missing Jetty runtime deps.
87c293f is described below

commit 87c293f1f89bdee31d9c2a70dc86505313f0207d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 10 14:19:32 2025 -0500

    Move testbed to 12.1 and add missing Jetty runtime deps.
---
 idp-testbed-jetty-12.launch |  2 +-
 pom.xml                     | 45 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/idp-testbed-jetty-12.launch b/idp-testbed-jetty-12.launch
index 6716a1b..d240afb 100644
--- a/idp-testbed-jetty-12.launch
+++ b/idp-testbed-jetty-12.launch
@@ -16,7 +16,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="Main"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="java-idp-testbed"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-Djetty.home=/opt/jetty-home-12.0.16 -Djava.security.egd=file:/dev/urandom -Didp.home=classpath:/net/shibboleth/idp/module -Didp.webflows=classpath*:/flows -Dlogback.configurationFile=resources/logback.xml -Didp.logfiles=${workspace_loc:java-idp-testbed/src/main/resources/logs} -Djava.io.tmpdir=tmp -Didp.loglevel.ldap=INFO -Didp.loglevel.idp=DEBUG -Didp.loglevel.opensaml=DEBUG -Didp.loglevel.messages=DEBUG"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-Djetty.home=/opt/jetty-home-12.1.3 -Djava.security.egd=file:/dev/urandom -Didp.home=classpath:/net/shibboleth/idp/module -Didp.webflows=classpath*:/flows -Dlogback.configurationFile=resources/logback.xml -Didp.logfiles=${workspace_loc:java-idp-testbed/src/main/resources/logs} -Djava.io.tmpdir=tmp -Didp.loglevel.ldap=INFO -Didp.loglevel.idp=DEBUG -Didp.loglevel.opensaml=DEBUG -Didp.loglevel.messages=DEBUG"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="java-idp-testbed"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:java-idp-jetty-base/src/main/resources/jetty-base}"/>
diff --git a/pom.xml b/pom.xml
index 0f55ded..3820820 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,12 +26,12 @@
         <opensaml.version>5.2.0-SNAPSHOT</opensaml.version>
         <shib-shared.groupId>net.shibboleth</shib-shared.groupId>
         <shib-shared.version>9.2.0-SNAPSHOT</shib-shared.version>
-        <cas-client.version>3.6.4</cas-client.version>
+        <cas-client.version>4.0.4</cas-client.version>
         <oidc-commons.version>3.2.0-SNAPSHOT</oidc-commons.version>
         <idp-jetty-base.version>12.0.0-SNAPSHOT</idp-jetty-base.version>
-        <jetty.version>12.0.16</jetty.version>
-        <logback.version>1.5.6</logback.version>
-        <slf4j.version>2.0.12</slf4j.version>
+        <jetty.version>12.1.3</jetty.version>
+        <logback.version>1.5.18</logback.version>
+        <slf4j.version>2.0.17</slf4j.version>
      </properties>
 
     <dependencies>
@@ -409,22 +409,46 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Runtime scope -->
 
         <!-- Don't know why we have to directly include these. -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-deploy</artifactId>
+            <version>${jetty.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.ee9</groupId>
+            <artifactId>jetty-ee9-annotations</artifactId>
+            <version>${jetty.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.ee9</groupId>
+            <artifactId>jetty-ee9-webapp</artifactId>
+            <version>${jetty.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.ee9</groupId>
+            <artifactId>jetty-ee9-plus</artifactId>
+            <version>${jetty.version}</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.ee9</groupId>
             <artifactId>jetty-ee9-apache-jsp</artifactId>
             <version>${jetty.version}</version>
-            <scope>provided</scope>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.ee9</groupId>
             <artifactId>jetty-ee9-glassfish-jstl</artifactId>
             <version>${jetty.version}</version>
-            <scope>provided</scope>
+            <scope>runtime</scope>
         </dependency>
 
-        <!-- Runtime scope -->
         <dependency>
             <groupId>${idp.groupId}</groupId>
             <artifactId>idp-conf-impl</artifactId>
@@ -500,11 +524,10 @@
             <artifactId>nashorn-core</artifactId>
             <scope>runtime</scope>
         </dependency>
-        
-        <!--
-        No Jakarta support yet.
+
+        <!--        
         <dependency>
-            <groupId>org.jasig.cas.client</groupId>
+            <groupId>org.apereo.cas.client</groupId>
             <artifactId>cas-client-core</artifactId>
             <version>${cas-client.version}</version>
             <scope>runtime</scope>

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