[java-identity-provider] branch main updated: Relocate IdP parent to root.
Scott Cantor
cantor.2 at osu.edu
Mon Nov 6 18:31:06 UTC 2023
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=39797182ecf68be65ed564328f74a0e8f8a47ad7
The following commit(s) were added to refs/heads/main by this push:
new 39797182e Relocate IdP parent to root.
39797182e is described below
commit 39797182ecf68be65ed564328f74a0e8f8a47ad7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 6 13:31:03 2023 -0500
Relocate IdP parent to root.
---
idp-admin-api/.checkstyle | 2 +-
idp-admin-api/pom.xml | 1 -
idp-admin-impl/.checkstyle | 2 +-
idp-admin-impl/pom.xml | 1 -
idp-authn-api/.checkstyle | 2 +-
idp-authn-api/pom.xml | 1 -
idp-authn-impl/.checkstyle | 2 +-
idp-authn-impl/pom.xml | 1 -
idp-bom/pom.xml | 1 -
idp-cas-api/.checkstyle | 18 +++---
idp-cas-api/pom.xml | 1 -
idp-cas-impl/.checkstyle | 18 +++---
idp-cas-impl/pom.xml | 1 -
idp-cli/.checkstyle | 2 +-
idp-cli/pom.xml | 1 -
idp-conf-impl/.checkstyle | 18 +++---
idp-conf-impl/pom.xml | 1 -
idp-consent-api/.checkstyle | 18 +++---
idp-consent-api/pom.xml | 1 -
idp-consent-impl/.checkstyle | 18 +++---
idp-consent-impl/pom.xml | 1 -
idp-core/.checkstyle | 2 +-
idp-core/pom.xml | 1 -
idp-distribution/pom.xml | 2 -
idp-installer/.checkstyle | 18 +++---
idp-installer/pom.xml | 1 -
idp-parent/.gitignore | 2 -
idp-parent/src/site/site.xml | 15 -----
idp-profile-api/.checkstyle | 2 +-
idp-profile-api/pom.xml | 1 -
idp-profile-impl/.checkstyle | 2 +-
idp-profile-impl/pom.xml | 1 -
idp-saml-api/.checkstyle | 2 +-
idp-saml-api/pom.xml | 1 -
idp-saml-impl/.checkstyle | 2 +-
idp-saml-impl/pom.xml | 1 -
idp-schema/pom.xml | 1 -
idp-session-api/.checkstyle | 18 +++---
idp-session-api/pom.xml | 1 -
idp-session-impl/.checkstyle | 18 +++---
idp-session-impl/pom.xml | 1 -
idp-spring/.checkstyle | 18 +++---
idp-spring/pom.xml | 1 -
idp-testing/.checkstyle | 2 +-
idp-testing/pom.xml | 1 -
idp-ui/.checkstyle | 18 +++---
idp-ui/pom.xml | 1 -
idp-war-distribution/pom.xml | 1 -
idp-war/pom.xml | 1 -
.../module-pom.xml.tmpl => module-pom.xml.tmpl | 10 +---
idp-parent/pom.xml => pom.xml | 68 +++++++++++-----------
.../checkstyle/checkstyle.xml | 0
52 files changed, 136 insertions(+), 188 deletions(-)
diff --git a/idp-admin-api/.checkstyle b/idp-admin-api/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-admin-api/.checkstyle
+++ b/idp-admin-api/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-admin-api/pom.xml b/idp-admin-api/pom.xml
index ac7ad2ba5..8ec4caff4 100644
--- a/idp-admin-api/pom.xml
+++ b/idp-admin-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Administrative Profile API</name>
diff --git a/idp-admin-impl/.checkstyle b/idp-admin-impl/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-admin-impl/.checkstyle
+++ b/idp-admin-impl/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-admin-impl/pom.xml b/idp-admin-impl/pom.xml
index a0c89faf3..18d3b8f1d 100644
--- a/idp-admin-impl/pom.xml
+++ b/idp-admin-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Administrative Profile Implementation</name>
diff --git a/idp-authn-api/.checkstyle b/idp-authn-api/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-authn-api/.checkstyle
+++ b/idp-authn-api/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-authn-api/pom.xml b/idp-authn-api/pom.xml
index a08fb8b84..c48995ec2 100644
--- a/idp-authn-api/pom.xml
+++ b/idp-authn-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Authentication API</name>
diff --git a/idp-authn-impl/.checkstyle b/idp-authn-impl/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-authn-impl/.checkstyle
+++ b/idp-authn-impl/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-authn-impl/pom.xml b/idp-authn-impl/pom.xml
index 7c074c93e..b93f75f78 100644
--- a/idp-authn-impl/pom.xml
+++ b/idp-authn-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Authentication Implementation</name>
diff --git a/idp-bom/pom.xml b/idp-bom/pom.xml
index cd7e37529..644a28758 100644
--- a/idp-bom/pom.xml
+++ b/idp-bom/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: BOM</name>
diff --git a/idp-cas-api/.checkstyle b/idp-cas-api/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-cas-api/.checkstyle
+++ b/idp-cas-api/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-cas-api/pom.xml b/idp-cas-api/pom.xml
index f421367e7..cfe31b19d 100644
--- a/idp-cas-api/pom.xml
+++ b/idp-cas-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: CAS Protocol API</name>
diff --git a/idp-cas-impl/.checkstyle b/idp-cas-impl/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-cas-impl/.checkstyle
+++ b/idp-cas-impl/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-cas-impl/pom.xml b/idp-cas-impl/pom.xml
index cfb4bf87f..b3acd5c51 100644
--- a/idp-cas-impl/pom.xml
+++ b/idp-cas-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: CAS Protocol Implementation</name>
diff --git a/idp-cli/.checkstyle b/idp-cli/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-cli/.checkstyle
+++ b/idp-cli/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-cli/pom.xml b/idp-cli/pom.xml
index d5be19aa1..4dea037aa 100644
--- a/idp-cli/pom.xml
+++ b/idp-cli/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Command Line</name>
diff --git a/idp-conf-impl/.checkstyle b/idp-conf-impl/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-conf-impl/.checkstyle
+++ b/idp-conf-impl/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-conf-impl/pom.xml b/idp-conf-impl/pom.xml
index 621d80fc2..a32320996 100644
--- a/idp-conf-impl/pom.xml
+++ b/idp-conf-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: System Configuration</name>
diff --git a/idp-consent-api/.checkstyle b/idp-consent-api/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-consent-api/.checkstyle
+++ b/idp-consent-api/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-consent-api/pom.xml b/idp-consent-api/pom.xml
index c46395ed8..1f091ae24 100644
--- a/idp-consent-api/pom.xml
+++ b/idp-consent-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Consent API</name>
diff --git a/idp-consent-impl/.checkstyle b/idp-consent-impl/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-consent-impl/.checkstyle
+++ b/idp-consent-impl/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-consent-impl/pom.xml b/idp-consent-impl/pom.xml
index 1451ff1b1..e90ef6894 100644
--- a/idp-consent-impl/pom.xml
+++ b/idp-consent-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Consent Implementation</name>
diff --git a/idp-core/.checkstyle b/idp-core/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-core/.checkstyle
+++ b/idp-core/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-core/pom.xml b/idp-core/pom.xml
index 363b4a189..60c294f7b 100644
--- a/idp-core/pom.xml
+++ b/idp-core/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Core</name>
diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index b93255092..521ea4596 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Distribution</name>
@@ -249,7 +248,6 @@
<dataArtifactId>maven-dist-enforcer-data</dataArtifactId>
<dataVersion>${maven-dist-enforcer-data.version}</dataVersion>
<dataKeyRing>${basedir}/../idp-bom/src/main/enforcer/shibbolethKeys.gpg</dataKeyRing>
- <parentPomDir>${basedir}/../idp-parent</parentPomDir>
<zipFiles>${project.build.directory}/${idp.finalName}.zip</zipFiles>
<tgzFiles>${project.build.directory}/${idp.finalName}.tar.gz</tgzFiles>
<checkSignatures>true</checkSignatures>
diff --git a/idp-installer/.checkstyle b/idp-installer/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-installer/.checkstyle
+++ b/idp-installer/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index 4ce20bc10..4a9c02ce8 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Installer</name>
diff --git a/idp-parent/.gitignore b/idp-parent/.gitignore
deleted file mode 100644
index 13e3fd460..000000000
--- a/idp-parent/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/local
-/target
diff --git a/idp-parent/src/site/site.xml b/idp-parent/src/site/site.xml
deleted file mode 100644
index 2c521a28d..000000000
--- a/idp-parent/src/site/site.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd">
-
- <publishDate position="navigation-bottom" />
-
- <body>
- <menu ref="reports" />
- <menu name="Parent">
- <item name="Shibboleth IdP" href="${idp-parent.site.url}" />
- </menu>
- <menu ref="modules" />
- </body>
-
-</project>
\ No newline at end of file
diff --git a/idp-profile-api/.checkstyle b/idp-profile-api/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-profile-api/.checkstyle
+++ b/idp-profile-api/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-profile-api/pom.xml b/idp-profile-api/pom.xml
index d0dbe7999..90cd1e67c 100644
--- a/idp-profile-api/pom.xml
+++ b/idp-profile-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Profile API</name>
diff --git a/idp-profile-impl/.checkstyle b/idp-profile-impl/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-profile-impl/.checkstyle
+++ b/idp-profile-impl/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-profile-impl/pom.xml b/idp-profile-impl/pom.xml
index 15c07af4f..dfabecde3 100644
--- a/idp-profile-impl/pom.xml
+++ b/idp-profile-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Profile Implementation</name>
diff --git a/idp-saml-api/.checkstyle b/idp-saml-api/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-saml-api/.checkstyle
+++ b/idp-saml-api/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-saml-api/pom.xml b/idp-saml-api/pom.xml
index f3754a5e2..426b2dc1f 100644
--- a/idp-saml-api/pom.xml
+++ b/idp-saml-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: SAML Profile API</name>
diff --git a/idp-saml-impl/.checkstyle b/idp-saml-impl/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-saml-impl/.checkstyle
+++ b/idp-saml-impl/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-saml-impl/pom.xml b/idp-saml-impl/pom.xml
index ca59d0794..22d97b307 100644
--- a/idp-saml-impl/pom.xml
+++ b/idp-saml-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: SAML Profile Implementation</name>
diff --git a/idp-schema/pom.xml b/idp-schema/pom.xml
index 1baaebb7c..055a0b7d2 100644
--- a/idp-schema/pom.xml
+++ b/idp-schema/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Configuration Schemas</name>
diff --git a/idp-session-api/.checkstyle b/idp-session-api/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-session-api/.checkstyle
+++ b/idp-session-api/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-session-api/pom.xml b/idp-session-api/pom.xml
index eb8d95718..4461b9a63 100644
--- a/idp-session-api/pom.xml
+++ b/idp-session-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Session API</name>
diff --git a/idp-session-impl/.checkstyle b/idp-session-impl/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-session-impl/.checkstyle
+++ b/idp-session-impl/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-session-impl/pom.xml b/idp-session-impl/pom.xml
index 16d4a2d60..81bb999c4 100644
--- a/idp-session-impl/pom.xml
+++ b/idp-session-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Session Implementation</name>
diff --git a/idp-spring/.checkstyle b/idp-spring/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-spring/.checkstyle
+++ b/idp-spring/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-spring/pom.xml b/idp-spring/pom.xml
index 6f1d509a4..46180d4ef 100644
--- a/idp-spring/pom.xml
+++ b/idp-spring/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Spring Integration</name>
diff --git a/idp-testing/.checkstyle b/idp-testing/.checkstyle
index 4147bd1de..587f28572 100644
--- a/idp-testing/.checkstyle
+++ b/idp-testing/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/idp-testing/pom.xml b/idp-testing/pom.xml
index 5c613aa4e..4e91f693d 100644
--- a/idp-testing/pom.xml
+++ b/idp-testing/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: Testing</name>
diff --git a/idp-ui/.checkstyle b/idp-ui/.checkstyle
index d3fc685e1..587f28572 100644
--- a/idp-ui/.checkstyle
+++ b/idp-ui/.checkstyle
@@ -2,14 +2,14 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
+ <local-check-config name="Shibboleth Checkstyle" location="/java-identity-provider/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/idp-ui/pom.xml b/idp-ui/pom.xml
index 0ce871694..ba5cc427b 100644
--- a/idp-ui/pom.xml
+++ b/idp-ui/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: UI Support</name>
diff --git a/idp-war-distribution/pom.xml b/idp-war-distribution/pom.xml
index 2bbbc9bcf..f68f3ef0b 100644
--- a/idp-war-distribution/pom.xml
+++ b/idp-war-distribution/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: WAR distribution</name>
diff --git a/idp-war/pom.xml b/idp-war/pom.xml
index 71d82e957..1860f0406 100644
--- a/idp-war/pom.xml
+++ b/idp-war/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
</parent>
<name>Shibboleth IdP :: WAR</name>
diff --git a/idp-parent/module-pom.xml.tmpl b/module-pom.xml.tmpl
similarity index 81%
rename from idp-parent/module-pom.xml.tmpl
rename to module-pom.xml.tmpl
index d6e93676e..0b75832bf 100644
--- a/idp-parent/module-pom.xml.tmpl
+++ b/module-pom.xml.tmpl
@@ -7,8 +7,7 @@
<parent>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
+ <version>5.1.0-SNAPSHOT</version>
</parent>
<name>MVN_ARTF_ID</name>
@@ -37,11 +36,4 @@
<url>${shibboleth.scm.url}java-identity-provider.git</url>
</scm>
- <distributionManagement>
- <site>
- <id>site</id>
- <url>dav:${idp-module.site.url}</url>
- </site>
- </distributionManagement>
-
</project>
diff --git a/idp-parent/pom.xml b/pom.xml
similarity index 94%
rename from idp-parent/pom.xml
rename to pom.xml
index a5a424053..c88b80387 100644
--- a/idp-parent/pom.xml
+++ b/pom.xml
@@ -23,39 +23,39 @@
<packaging>pom</packaging>
<modules>
- <module>../idp-core</module>
- <module>../idp-schema</module>
-
- <module>../idp-admin-api</module>
- <module>../idp-authn-api</module>
- <module>../idp-cas-api</module>
- <module>../idp-profile-api</module>
- <module>../idp-saml-api</module>
- <module>../idp-session-api</module>
- <module>../idp-consent-api</module>
-
- <module>../idp-admin-impl</module>
- <module>../idp-authn-impl</module>
- <module>../idp-cas-impl</module>
- <module>../idp-consent-impl</module>
- <module>../idp-profile-impl</module>
- <module>../idp-saml-impl</module>
- <module>../idp-session-impl</module>
-
- <module>../idp-spring</module>
-
- <module>../idp-war</module>
- <module>../idp-war-distribution</module>
- <module>../idp-cli</module>
- <module>../idp-installer</module>
- <module>../idp-conf-impl</module>
- <module>../idp-distribution</module>
-
- <module>../idp-ui</module>
-
- <module>../idp-testing</module>
-
- <module>../idp-bom</module>
+ <module>idp-core</module>
+ <module>idp-schema</module>
+
+ <module>idp-admin-api</module>
+ <module>idp-authn-api</module>
+ <module>idp-cas-api</module>
+ <module>idp-profile-api</module>
+ <module>idp-saml-api</module>
+ <module>idp-session-api</module>
+ <module>idp-consent-api</module>
+
+ <module>idp-admin-impl</module>
+ <module>idp-authn-impl</module>
+ <module>idp-cas-impl</module>
+ <module>idp-consent-impl</module>
+ <module>idp-profile-impl</module>
+ <module>idp-saml-impl</module>
+ <module>idp-session-impl</module>
+
+ <module>idp-spring</module>
+
+ <module>idp-war</module>
+ <module>idp-war-distribution</module>
+ <module>idp-cli</module>
+ <module>idp-installer</module>
+ <module>idp-conf-impl</module>
+ <module>idp-distribution</module>
+
+ <module>idp-ui</module>
+
+ <module>idp-testing</module>
+
+ <module>idp-bom</module>
</modules>
<properties>
@@ -69,7 +69,7 @@
<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>
- <checkstyle.configLocation>${project.basedir}/../idp-parent/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
+ <checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
</properties>
<dependencies>
diff --git a/idp-parent/resources/checkstyle/checkstyle.xml b/resources/checkstyle/checkstyle.xml
similarity index 100%
rename from idp-parent/resources/checkstyle/checkstyle.xml
rename to resources/checkstyle/checkstyle.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list