[java-identity-provider] branch main updated: Rename IdP Spring module.
Scott Cantor
cantor.2 at osu.edu
Mon Jul 11 13:43:38 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=187a4f3e669f740c99616c9da32ead03041ad2fd
The following commit(s) were added to refs/heads/main by this push:
new 187a4f3e6 Rename IdP Spring module.
187a4f3e6 is described below
commit 187a4f3e669f740c99616c9da32ead03041ad2fd
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 11 09:43:34 2022 -0400
Rename IdP Spring module.
---
idp-bom/pom.xml | 2 +-
idp-conf/pom.xml | 2 +-
idp-installer/pom.xml | 8 ------
idp-parent/pom.xml | 2 +-
idp-profile-spring/.project | 2 +-
idp-profile-spring/pom.xml | 8 +++---
idp-tests-bom/pom.xml | 2 +-
idp-war/.settings/org.eclipse.wst.common.component | 33 +++++++++++++---------
idp-war/pom.xml | 10 +++----
9 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/idp-bom/pom.xml b/idp-bom/pom.xml
index 447f46a3f..1eac62767 100644
--- a/idp-bom/pom.xml
+++ b/idp-bom/pom.xml
@@ -103,7 +103,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-spring</artifactId>
+ <artifactId>idp-spring</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
index a7611e997..b94163b48 100644
--- a/idp-conf/pom.xml
+++ b/idp-conf/pom.xml
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-spring</artifactId>
+ <artifactId>idp-spring</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index 6bae3238c..4eb34ad32 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -37,14 +37,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
- <!-- TODO: Probably historical? -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-spring</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>net.shibboleth</groupId>
diff --git a/idp-parent/pom.xml b/idp-parent/pom.xml
index e0ef1cceb..8d2c040b2 100644
--- a/idp-parent/pom.xml
+++ b/idp-parent/pom.xml
@@ -43,7 +43,7 @@
<module>../idp-saml-impl</module>
<module>../idp-session-impl</module>
- <module>../idp-profile-spring</module>
+ <module>../idp-spring</module>
<module>../idp-war</module>
<module>../idp-war-distribution</module>
diff --git a/idp-profile-spring/.project b/idp-profile-spring/.project
index 3ab809be8..9fa0db2c9 100644
--- a/idp-profile-spring/.project
+++ b/idp-profile-spring/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>idp-profile-spring</name>
+ <name>idp-spring</name>
<comment></comment>
<projects>
</projects>
diff --git a/idp-profile-spring/pom.xml b/idp-profile-spring/pom.xml
index 43f29ccbe..3ce3bf787 100644
--- a/idp-profile-spring/pom.xml
+++ b/idp-profile-spring/pom.xml
@@ -11,13 +11,13 @@
<relativePath>../idp-parent</relativePath>
</parent>
- <name>Shibboleth IdP :: Profile Spring Integration</name>
- <description>Profile Spring Integration</description>
- <artifactId>idp-profile-spring</artifactId>
+ <name>Shibboleth IdP :: Spring Integration</name>
+ <description>Spring Integration</description>
+ <artifactId>idp-spring</artifactId>
<packaging>jar</packaging>
<properties>
- <automatic.module.name>net.shibboleth.idp.profile.spring</automatic.module.name>
+ <automatic.module.name>net.shibboleth.idp.spring</automatic.module.name>
</properties>
<dependencies>
diff --git a/idp-tests-bom/pom.xml b/idp-tests-bom/pom.xml
index 3b9d57e76..876e8ebcb 100644
--- a/idp-tests-bom/pom.xml
+++ b/idp-tests-bom/pom.xml
@@ -171,7 +171,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-spring</artifactId>
+ <artifactId>idp-spring</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/idp-war/.settings/org.eclipse.wst.common.component b/idp-war/.settings/org.eclipse.wst.common.component
index bf4f675c3..1046baa5f 100644
--- a/idp-war/.settings/org.eclipse.wst.common.component
+++ b/idp-war/.settings/org.eclipse.wst.common.component
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-
+
+
<wb-module deploy-name="idp-war-5.0.0-SNAPSHOT">
-
+
+
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-
+
+
@@ -56,12 +59,6 @@
<dependent-module archiveName="idp-profile-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-profile-impl/idp-profile-impl">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="idp-profile-spring-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-profile-spring/idp-profile-spring">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module archiveName="opensaml-spring-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-spring/opensaml-spring">
- <dependency-type>uses</dependency-type>
- </dependent-module>
<dependent-module archiveName="idp-saml-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-saml-api/idp-saml-api">
<dependency-type>uses</dependency-type>
</dependent-module>
@@ -77,6 +74,12 @@
<dependent-module archiveName="idp-session-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-session-impl/idp-session-impl">
<dependency-type>uses</dependency-type>
</dependent-module>
+ <dependent-module archiveName="idp-spring-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-spring/idp-spring">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-spring-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-spring/opensaml-spring">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
<dependent-module archiveName="idp-ui-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-ui/idp-ui">
<dependency-type>uses</dependency-type>
</dependent-module>
@@ -167,25 +170,29 @@
<dependent-module archiveName="opensaml-xmlsec-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-xmlsec-impl/opensaml-xmlsec-impl">
<dependency-type>uses</dependency-type>
</dependent-module>
-
+
+
<property name="context-root" value="idp-war"/>
-
+
+
<property name="java-output-path" value="/idp-war/target/classes"/>
-
+
+
</wb-module>
-
+
+
diff --git a/idp-war/pom.xml b/idp-war/pom.xml
index 298ae0394..dfe5a2d4d 100644
--- a/idp-war/pom.xml
+++ b/idp-war/pom.xml
@@ -79,11 +79,6 @@
<artifactId>idp-profile-impl</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-spring</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-saml-api</artifactId>
@@ -109,6 +104,11 @@
<artifactId>idp-session-impl</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-ui</artifactId>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list