[java-idp-jetty-base] 01/03: Initial commits for 12 branch.

[Scott Cantor]

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

scantor pushed a commit to branch 11-testbed-eclipse
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=b5bef3b0e4fbd51862494c30f1c30423c7d171ae

commit b5bef3b0e4fbd51862494c30f1c30423c7d171ae
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 25 16:05:26 2024 -0400

    Initial commits for 12 branch.
---
 pom.xml                                           | 23 +++--------------------
 src/main/resources/jetty-base/modules/idp.mod     | 14 ++++++++------
 src/main/resources/jetty-base/webapps/idp.xml     |  3 +--
 src/main/resources/jetty-base/webapps/testbed.xml |  2 +-
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2feb001..c50c106 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,37 +7,20 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent</artifactId>
-        <version>17.0.3-SNAPSHOT</version>
+        <version>17.1.2-SNAPSHOT</version>
     </parent>
 
     <name>idp-jetty-base</name>
     <groupId>net.shibboleth.idp</groupId>
     <artifactId>idp-jetty-base</artifactId>
     <packaging>pom</packaging>
-    <version>11.0.0-SNAPSHOT</version>
+    <version>12.0.0-SNAPSHOT</version>
 
     <properties>
         <assemblyDirectory>${project.build.directory}/idp-jetty-base</assemblyDirectory>
-        <logback.version>1.4.6</logback.version>
+        <logback.version>1.4.14</logback.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>shib-release</id>
-            <url>https://build.shibboleth.net/nexus/content/groups/public</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>shib-snapshot</id>
-            <url>https://build.shibboleth.net/nexus/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
     <dependencies>
         <!-- Compile Dependencies -->
 
diff --git a/src/main/resources/jetty-base/modules/idp.mod b/src/main/resources/jetty-base/modules/idp.mod
index 2b21c1e..11041b9 100644
--- a/src/main/resources/jetty-base/modules/idp.mod
+++ b/src/main/resources/jetty-base/modules/idp.mod
@@ -2,16 +2,18 @@
 Shibboleth IdP
 
 [depend]
-annotations
-deploy
+ee10-annotations
+ee10-deploy
+ext
+ee10-webapp
 http
 https
-jsp
-jstl
-plus
+ee10-jsp
+ee10-jstl
+ee10-plus
 resources
 server
-servlets
+ee10-servlets
 ssl
 
 [files]
diff --git a/src/main/resources/jetty-base/webapps/idp.xml b/src/main/resources/jetty-base/webapps/idp.xml
index 507fc38..6381549 100644
--- a/src/main/resources/jetty-base/webapps/idp.xml
+++ b/src/main/resources/jetty-base/webapps/idp.xml
@@ -3,11 +3,10 @@
 <!-- =============================================================== -->
 <!-- Configure the Shibboleth IdP webapp                             -->
 <!-- =============================================================== -->
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Set name="war">../../../../../java-identity-provider/idp-war/src/main/webapp</Set>
   <Set name="contextPath"><SystemProperty name="idp.context.path" default="/idp" /></Set>
   <Set name="extractWAR">false</Set>
   <Set name="copyWebDir">false</Set>
   <Set name="copyWebInf">true</Set>
-  <Set name="persistTempDirectory">false</Set>
 </Configure>
diff --git a/src/main/resources/jetty-base/webapps/testbed.xml b/src/main/resources/jetty-base/webapps/testbed.xml
index 9578ea8..c3b5a42 100644
--- a/src/main/resources/jetty-base/webapps/testbed.xml
+++ b/src/main/resources/jetty-base/webapps/testbed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Set name="war">../../../../../java-idp-testbed/src/main/webapp/</Set>
   <Set name="contextPath">/</Set>
   <Set name="extractWAR">false</Set>

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