[java-idp-testbed] 01/01: Adjust for Jetty 11 on branch.

[Scott Cantor]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=30490bfd3adb440d100ce2442add693a57b7f3a7

commit 30490bfd3adb440d100ce2442add693a57b7f3a7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 26 10:34:02 2024 -0400

    Adjust for Jetty 11 on branch.
---
 idp-testbed-jetty-12.launch | 23 -----------------------
 pom.xml                     | 24 ------------------------
 2 files changed, 47 deletions(-)

diff --git a/idp-testbed-jetty-12.launch b/idp-testbed-jetty-12.launch
deleted file mode 100644
index 0de5f19..0000000
--- a/idp-testbed-jetty-12.launch
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-    <stringAttribute key="bad_container_name" value="/idp-testbed-jetty-12"/>
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/java-idp-testbed/src/main/java/Main.java"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="1"/>
-    </listAttribute>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-    <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.7 -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}"/>
-</launchConfiguration>
diff --git a/pom.xml b/pom.xml
index 41604de..4dbc6a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,19 +29,11 @@
         <cas-client.version>3.6.4</cas-client.version>
         <oidc-commons.version>3.0.1-SNAPSHOT</oidc-commons.version>
         <!-- Jetty 11 -->
-        <!--
         <idp-jetty-base.version>11.0.0-SNAPSHOT</idp-jetty-base.version>
         <jetty.version>11.0.15</jetty.version>
         <jetty-jstl.version>11.0.0</jetty-jstl.version>
         <logback.version>1.4.6</logback.version>
         <slf4j.version>2.0.3</slf4j.version>
-        -->
-        <!-- Jetty 12 -->
-        <!-- Also requires removing the JSTL deps. -->
-        <idp-jetty-base.version>12.0.0-SNAPSHOT</idp-jetty-base.version>
-        <jetty.version>12.0.7</jetty.version>
-        <logback.version>1.4.14</logback.version>
-        <slf4j.version>2.0.9</slf4j.version>
      </properties>
 
     <dependencies>
@@ -423,7 +415,6 @@
         <!-- Don't know why we have to directly include these. -->
         
         <!-- Jetty 11 -->
-        <!--
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>apache-jsp</artifactId>
@@ -436,21 +427,6 @@
             <version>${jetty-jstl.version}</version>
             <scope>provided</scope>
         </dependency>
-        -->
-        
-        <!-- Jetty 12 -->
-        <dependency>
-            <groupId>org.eclipse.jetty.ee9</groupId>
-            <artifactId>jetty-ee9-apache-jsp</artifactId>
-            <version>${jetty.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.ee9</groupId>
-            <artifactId>jetty-ee9-glassfish-jstl</artifactId>
-            <version>${jetty.version}</version>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Runtime scope -->
         <dependency>

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