[java-idp-testbed] branch main updated: Java 17 / Jetty 11 platform changes.
Scott Cantor
cantor.2 at osu.edu
Wed Jun 1 14:56:39 UTC 2022
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:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=d45505af034be40d900726517ff44a9d89107082
The following commit(s) were added to refs/heads/main by this push:
new d45505a Java 17 / Jetty 11 platform changes.
d45505a is described below
commit d45505af034be40d900726517ff44a9d89107082
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jun 1 10:56:24 2022 -0400
Java 17 / Jetty 11 platform changes.
---
...-jetty-10.launch => idp-testbed-jetty-11.launch | 2 +-
idp-testbed-jetty-9.4.launch | 19 --------------
pom.xml | 30 ++++++++++------------
src/main/java/sp/BaseSAMLController.java | 2 +-
src/main/java/sp/CASController.java | 4 +--
src/main/java/sp/SAML1Controller.java | 4 +--
src/main/java/sp/SAML2Controller.java | 4 +--
7 files changed, 21 insertions(+), 44 deletions(-)
diff --git a/idp-testbed-jetty-10.launch b/idp-testbed-jetty-11.launch
similarity index 97%
rename from idp-testbed-jetty-10.launch
rename to idp-testbed-jetty-11.launch
index 441bdd1..80ad571 100644
--- a/idp-testbed-jetty-10.launch
+++ b/idp-testbed-jetty-11.launch
@@ -15,7 +15,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-11/"/>
<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-10.0.9 -Djava.security.egd=file:/dev/urandom -Didp.home=classpath: -Didp.webflows=classpath*:/flows -Dlogback.configurationFile=resources/logback.xml -Didp.logfiles=${workspace_loc:java-idp-testbed/src/main/resources/logs} -Djava.io.tmpdir=tmp -Dnet.shibboleth.idp.plugin.oidc.op.servlet.RegisterFilterServletContextInitializer=disabled -Didp.loglevel.ldap=INFO -Didp.loglevel.idp=DEBU [...]
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-Djetty.home=/opt/jetty-home-11.0.9 -Djava.security.egd=file:/dev/urandom -Didp.home=classpath: -Didp.webflows=classpath*:/flows -Dlogback.configurationFile=resources/logback.xml -Didp.logfiles=${workspace_loc:java-idp-testbed/src/main/resources/logs} -Djava.io.tmpdir=tmp -Dnet.shibboleth.idp.plugin.oidc.op.servlet.RegisterFilterServletContextInitializer=disabled -Didp.loglevel.ldap=INFO -Didp.loglevel.idp=DEBU [...]
<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/idp-testbed-jetty-9.4.launch b/idp-testbed-jetty-9.4.launch
deleted file mode 100644
index 1afa38a..0000000
--- a/idp-testbed-jetty-9.4.launch
+++ /dev/null
@@ -1,19 +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-9.4"/>
- <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
- <listEntry value="/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_EXCLUDE_TEST_CODE" 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.MAIN_TYPE" value="Main"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-Djetty.home=/opt/jetty/jetty-9.4 -Didp.home=classpath: -Didp.webflows=classpath*:/flows -Djava.io.tmpdir=tmp -Dnet.shibboleth.idp.plugin.oidc.op.servlet.RegisterFilterServletContextInitializer=disabled"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="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:idp-jetty-base/src/main/resources/jetty-base}"/>
-</launchConfiguration>
diff --git a/pom.xml b/pom.xml
index 6b0bef8..f36c8d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,32 +4,28 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>11.3.3-SNAPSHOT</version>
+ <version>17.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-testbed</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<packaging>war</packaging>
<properties>
<idp.groupId>net.shibboleth.idp</idp.groupId>
- <idp.version>4.2.2-SNAPSHOT</idp.version>
- <idp-jetty-base.version>9.4.1-SNAPSHOT</idp-jetty-base.version>
- <jetty.version>9.4.44.v20210927</jetty.version>
+ <idp.version>5.0.0-SNAPSHOT</idp.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
- <opensaml.version>4.2.1-SNAPSHOT</opensaml.version>
- <spring-extensions.version>6.2.1-SNAPSHOT</spring-extensions.version>
+ <opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
+ <spring-extensions.version>7.0.0-SNAPSHOT</spring-extensions.version>
<cas-client.version>3.5.1</cas-client.version>
<oidc-commons.version>2.1.0-SNAPSHOT</oidc-commons.version>
- <!-- Jetty 10 -->
- <!--
- <idp-jetty-base.version>10.0.0-SNAPSHOT</idp-jetty-base.version>
- <jetty.version>10.0.9</jetty.version>
+ <idp-jetty-base.version>11.0.0-SNAPSHOT</idp-jetty-base.version>
+ <jetty.version>11.0.9</jetty.version>
+ <jetty-jstl.version>11.0.0</jetty-jstl.version>
<logback.version>1.3.0-alpha13</logback.version>
<slf4j.version>2.0.0-alpha5</slf4j.version>
- -->
</properties>
<repositories>
@@ -207,13 +203,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -258,7 +254,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty-jstl.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/src/main/java/sp/BaseSAMLController.java b/src/main/java/sp/BaseSAMLController.java
index 6c3bc54..0ef2302 100644
--- a/src/main/java/sp/BaseSAMLController.java
+++ b/src/main/java/sp/BaseSAMLController.java
@@ -17,7 +17,7 @@
package sp;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
diff --git a/src/main/java/sp/CASController.java b/src/main/java/sp/CASController.java
index 22c4866..0f305bb 100644
--- a/src/main/java/sp/CASController.java
+++ b/src/main/java/sp/CASController.java
@@ -20,8 +20,8 @@ package sp;
import java.net.MalformedURLException;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/sp/SAML1Controller.java b/src/main/java/sp/SAML1Controller.java
index c52ad02..633a2ca 100644
--- a/src/main/java/sp/SAML1Controller.java
+++ b/src/main/java/sp/SAML1Controller.java
@@ -28,8 +28,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.net.ssl.SSLContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
diff --git a/src/main/java/sp/SAML2Controller.java b/src/main/java/sp/SAML2Controller.java
index edcf821..a13e34a 100644
--- a/src/main/java/sp/SAML2Controller.java
+++ b/src/main/java/sp/SAML2Controller.java
@@ -12,8 +12,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.net.ssl.SSLContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list