[java-sp-server] branch main updated: Freshen POMs.
Scott Cantor
cantor.2 at osu.edu
Thu Feb 8 15:27:16 UTC 2024
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=07b6cbfa11b268aca52e6ce5c72e843a3f0958c1
The following commit(s) were added to refs/heads/main by this push:
new 07b6cbf Freshen POMs.
07b6cbf is described below
commit 07b6cbfa11b268aca52e6ce5c72e843a3f0958c1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Feb 8 10:27:13 2024 -0500
Freshen POMs.
---
pom.xml | 271 +++++++++++++++++----
.../sp/ddf/RemotedHttpServletRequestTest.java | 2 +-
sp-testing/pom.xml | 4 +
3 files changed, 235 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index 173e746..87c5b56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>17.0.0-SNAPSHOT</version>
+ <version>17.1.0-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.sp</groupId>
@@ -16,11 +16,17 @@
<packaging>pom</packaging>
<properties>
- <shib-profile.version>5.0.0-SNAPSHOT</shib-profile.version>
- <shib-attribute.version>5.0.0-SNAPSHOT</shib-attribute.version>
- <shib-metadata.version>5.0.0-SNAPSHOT</shib-metadata.version>
- <opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
- <shib-shared.version>9.0.0-SNAPSHOT</shib-shared.version>
+ <shibboleth.projectName>java-sp-server</shibboleth.projectName>
+ <shib-shared.groupId>net.shibboleth</shib-shared.groupId>
+ <shib-shared.version>9.1.0-SNAPSHOT</shib-shared.version>
+ <opensaml.groupId>org.opensaml</opensaml.groupId>
+ <opensaml.version>5.1.0-SNAPSHOT</opensaml.version>
+ <shib-metadata.groupId>net.shibboleth</shib-metadata.groupId>
+ <shib-metadata.version>5.1.0-SNAPSHOT</shib-metadata.version>
+ <shib-attribute.groupId>net.shibboleth</shib-attribute.groupId>
+ <shib-attribute.version>5.1.0-SNAPSHOT</shib-attribute.version>
+ <shib-profile.groupId>net.shibboleth</shib-profile.groupId>
+ <shib-profile.version>5.1.0-SNAPSHOT</shib-profile.version>
<spring-int.version>6.0.1</spring-int.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
</properties>
@@ -29,19 +35,6 @@
Processing service/engine/hub for the Shibboleth Service Provider.
</description>
- <scm>
- <connection>scm:git:https://git.shibboleth.net/git/java-sp-server</connection>
- <developerConnection>scm:git:git at git.shibboleth.net:java-sp-server</developerConnection>
- <url>https://git.shibboleth.net/view/?p=java-sp-server.git</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>site</id>
- <url>scp:${shibboleth.site.deploy.url}java-sp-server/${project.version}/</url>
- </site>
- </distributionManagement>
-
<repositories>
<repository>
<id>shib-release</id>
@@ -91,41 +84,227 @@
</dependencies>
<dependencyManagement>
<dependencies>
+ <!-- Compile Dependencies -->
<dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-profile-bom</artifactId>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
+ <version>${shib-profile.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-impl</artifactId>
+ <version>${shib-profile.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-saml-profile-api</artifactId>
<version>${shib-profile.version}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
+
<dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-attribute-bom</artifactId>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-api</artifactId>
+ <version>${shib-attribute.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-impl</artifactId>
+ <version>${shib-attribute.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-saml-attribute-api</artifactId>
+ <version>${shib-attribute.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-saml-attribute-impl</artifactId>
+ <version>${shib-attribute.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-filter-api</artifactId>
+ <version>${shib-attribute.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-filter-impl</artifactId>
+ <version>${shib-attribute.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-filter-spring</artifactId>
+ <version>${shib-attribute.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-resolver-api</artifactId>
<version>${shib-attribute.version}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-metadata-bom</artifactId>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-resolver-impl</artifactId>
+ <version>${shib-attribute.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-resolver-spring</artifactId>
+ <version>${shib-attribute.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${shib-metadata.groupId}</groupId>
+ <artifactId>shib-metadata-api</artifactId>
<version>${shib-metadata.version}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
<dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-bom</artifactId>
+ <groupId>${shib-metadata.groupId}</groupId>
+ <artifactId>shib-metadata-impl</artifactId>
+ <version>${shib-metadata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-metadata.groupId}</groupId>
+ <artifactId>shib-metadata-spring</artifactId>
+ <version>${shib-metadata.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-impl</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-impl</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-impl</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-impl</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-impl</artifactId>
<version>${opensaml.version}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-shared-bom</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-soap-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-soap-impl</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-spring</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-storage-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-storage-impl</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-impl</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-cli</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking-spring</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security-spring</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
<version>${shib-shared.version}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-velocity</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-velocity-spring</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
@@ -134,9 +313,19 @@
<type>pom</type>
</dependency>
- <!-- Compile Dependencies -->
-
<!-- Test Dependencies -->
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-testing</artifactId>
+ <version>${shib-shared.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-testing</artifactId>
+ <version>${opensaml.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletRequestTest.java b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletRequestTest.java
index 6689265..2fd13b0 100644
--- a/sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletRequestTest.java
+++ b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletRequestTest.java
@@ -78,7 +78,7 @@ public class RemotedHttpServletRequestTest {
assertEquals(req.getContentType(), "text/xml");
assertEquals(req.getCookies(), null);
assertEquals(req.getHeader("foo"), null);
- assertEquals(Files.streamToString(req.getInputStream()), "<foo/>");
+ assertEquals(Files.readFile(req.getInputStream()), "<foo/>");
assertEquals(req.getMethod(), "POST");
assertEquals(req.getParameter("foo"), null);
assertEquals(req.getQueryString(), null);
diff --git a/sp-testing/pom.xml b/sp-testing/pom.xml
index da7c506..64a57b1 100644
--- a/sp-testing/pom.xml
+++ b/sp-testing/pom.xml
@@ -43,9 +43,12 @@
<groupId>net.shibboleth</groupId>
<artifactId>shib-support</artifactId>
</dependency>
+
+ <!-- Normally test scope. -->
<dependency>
<groupId>net.shibboleth</groupId>
<artifactId>shib-testing</artifactId>
+ <scope>compile</scope>
</dependency>
<!-- Normally test scope. -->
@@ -55,6 +58,7 @@
<scope>compile</scope>
</dependency>
+ <!-- Normally test scope. -->
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list