[java-sp-server] branch main updated: Update POM and project files.
Scott Cantor
cantor.2 at osu.edu
Thu Jun 2 15:08:02 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-sp-server.
View the commit online:
http://git.shibboleth.net/view/?p=java-sp-server.git;a=commit;h=7453a93c7fa5da21d6ba57cbbb8f1af0cb6b8081
The following commit(s) were added to refs/heads/main by this push:
new 7453a93 Update POM and project files.
7453a93 is described below
commit 7453a93c7fa5da21d6ba57cbbb8f1af0cb6b8081
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jun 2 11:07:59 2022 -0400
Update POM and project files.
---
pom.xml | 8 ++++----
sp-conf-impl/.classpath | 14 +-------------
sp-conf-impl/.settings/org.eclipse.jdt.core.prefs | 2 +-
sp-conf/.classpath | 14 ++++++++------
sp-server-api/.classpath | 10 ++--------
sp-server-api/.settings/org.eclipse.jdt.core.prefs | 2 +-
sp-server-api/pom.xml | 4 ++--
sp-server-impl/.classpath | 22 ++++++++--------------
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
sp-server-impl/pom.xml | 4 ++--
10 files changed, 30 insertions(+), 52 deletions(-)
diff --git a/pom.xml b/pom.xml
index 87741ad..8314965 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>11.3.3-SNAPSHOT</version>
+ <version>17.0.0-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.sp</groupId>
@@ -16,9 +16,9 @@
<packaging>pom</packaging>
<properties>
- <opensaml.version>4.2.1-SNAPSHOT</opensaml.version>
- <spring-extensions.version>6.2.1-SNAPSHOT</spring-extensions.version>
- <java-support.version>8.3.2-SNAPSHOT</java-support.version>
+ <opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
+ <spring-extensions.version>7.0.0-SNAPSHOT</spring-extensions.version>
+ <java-support.version>9.0.0-SNAPSHOT</java-support.version>
<spring-int.version>5.5.11</spring-int.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle.xml</checkstyle.configLocation>
</properties>
diff --git a/sp-conf-impl/.classpath b/sp-conf-impl/.classpath
index af632dc..64dc7ce 100644
--- a/sp-conf-impl/.classpath
+++ b/sp-conf-impl/.classpath
@@ -1,25 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <classpathentry excluding="**" kind="src" path="src/main/resources">
<attributes>
- <attribute name="test" value="true"/>
- <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
diff --git a/sp-conf-impl/.settings/org.eclipse.jdt.core.prefs b/sp-conf-impl/.settings/org.eclipse.jdt.core.prefs
index 7fa508c..af08edf 100644
--- a/sp-conf-impl/.settings/org.eclipse.jdt.core.prefs
+++ b/sp-conf-impl/.settings/org.eclipse.jdt.core.prefs
@@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/sp-conf/.classpath b/sp-conf/.classpath
index 135508e..54f0060 100644
--- a/sp-conf/.classpath
+++ b/sp-conf/.classpath
@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <classpathentry excluding="**" kind="src" path="src/main/resources">
<attributes>
- <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="**" kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
diff --git a/sp-server-api/.classpath b/sp-server-api/.classpath
index 4559ca0..5bb3b61 100644
--- a/sp-server-api/.classpath
+++ b/sp-server-api/.classpath
@@ -1,20 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
+ <attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
diff --git a/sp-server-api/.settings/org.eclipse.jdt.core.prefs b/sp-server-api/.settings/org.eclipse.jdt.core.prefs
index 7fa508c..af08edf 100644
--- a/sp-server-api/.settings/org.eclipse.jdt.core.prefs
+++ b/sp-server-api/.settings/org.eclipse.jdt.core.prefs
@@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/sp-server-api/pom.xml b/sp-server-api/pom.xml
index 1457934..a57c11e 100644
--- a/sp-server-api/pom.xml
+++ b/sp-server-api/pom.xml
@@ -51,8 +51,8 @@
<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>
<!-- Test Dependencies -->
diff --git a/sp-server-impl/.classpath b/sp-server-impl/.classpath
index 2f276f7..42b736c 100644
--- a/sp-server-impl/.classpath
+++ b/sp-server-impl/.classpath
@@ -1,37 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
- <attribute name="optional" value="true"/>
+ <attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <classpathentry excluding="**" kind="src" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
- <attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
- <attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
diff --git a/sp-server-impl/.settings/org.eclipse.jdt.core.prefs b/sp-server-impl/.settings/org.eclipse.jdt.core.prefs
index 7fa508c..af08edf 100644
--- a/sp-server-impl/.settings/org.eclipse.jdt.core.prefs
+++ b/sp-server-impl/.settings/org.eclipse.jdt.core.prefs
@@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/sp-server-impl/pom.xml b/sp-server-impl/pom.xml
index 9ef5ede..83eeebc 100644
--- a/sp-server-impl/pom.xml
+++ b/sp-server-impl/pom.xml
@@ -63,8 +63,8 @@
<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>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list