[java-opensaml] branch main updated: Relocate opensaml parent into root of project.
Scott Cantor
cantor.2 at osu.edu
Mon Nov 6 17:42:07 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=7b76e4637b1f1009bab4183e01941fba20e07cb3
The following commit(s) were added to refs/heads/main by this push:
new 7b76e4637 Relocate opensaml parent into root of project.
7b76e4637 is described below
commit 7b76e4637b1f1009bab4183e01941fba20e07cb3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 6 12:42:03 2023 -0500
Relocate opensaml parent into root of project.
---
.../module-pom.xml.tmpl => module-pom.xml.tmpl | 10 +---
opensaml-bom/pom.xml | 1 -
opensaml-core-api/.checkstyle | 2 +-
opensaml-core-api/pom.xml | 1 -
opensaml-core-impl/.checkstyle | 2 +-
opensaml-core-impl/pom.xml | 1 -
opensaml-messaging-api/.checkstyle | 2 +-
opensaml-messaging-api/pom.xml | 1 -
opensaml-messaging-impl/.checkstyle | 2 +-
opensaml-messaging-impl/pom.xml | 69 +++++++++++-----------
opensaml-parent/.gitignore | 1 -
opensaml-parent/src/site/site.xml | 15 -----
opensaml-profile-api/.checkstyle | 18 +++---
opensaml-profile-api/pom.xml | 1 -
opensaml-profile-impl/.checkstyle | 18 +++---
opensaml-profile-impl/pom.xml | 1 -
opensaml-saml-api/.checkstyle | 2 +-
opensaml-saml-api/pom.xml | 1 -
opensaml-saml-impl/.checkstyle | 2 +-
opensaml-saml-impl/pom.xml | 1 -
opensaml-security-api/.checkstyle | 2 +-
opensaml-security-api/pom.xml | 1 -
opensaml-security-impl/.checkstyle | 2 +-
opensaml-security-impl/pom.xml | 1 -
opensaml-soap-api/.checkstyle | 2 +-
opensaml-soap-api/pom.xml | 1 -
opensaml-soap-impl/.checkstyle | 2 +-
opensaml-soap-impl/pom.xml | 1 -
opensaml-spring/.checkstyle | 2 +-
opensaml-spring/pom.xml | 1 -
opensaml-storage-api/.checkstyle | 18 +++---
opensaml-storage-api/pom.xml | 1 -
opensaml-storage-impl/.checkstyle | 18 +++---
opensaml-storage-impl/pom.xml | 1 -
opensaml-testing/.checkstyle | 2 +-
opensaml-testing/pom.xml | 1 -
opensaml-xacml-api/.checkstyle | 2 +-
opensaml-xacml-api/pom.xml | 1 -
opensaml-xacml-impl/.checkstyle | 2 +-
opensaml-xacml-impl/pom.xml | 1 -
opensaml-xacml-saml-api/.checkstyle | 2 +-
opensaml-xacml-saml-api/pom.xml | 1 -
opensaml-xacml-saml-impl/.checkstyle | 2 +-
opensaml-xacml-saml-impl/pom.xml | 1 -
opensaml-xmlsec-api/.checkstyle | 2 +-
opensaml-xmlsec-api/pom.xml | 1 -
opensaml-xmlsec-impl/.checkstyle | 2 +-
opensaml-xmlsec-impl/pom.xml | 1 -
opensaml-parent/pom.xml => pom.xml | 50 ++++++++--------
.../checkstyle/checkstyle.xml | 0
50 files changed, 114 insertions(+), 161 deletions(-)
diff --git a/opensaml-parent/module-pom.xml.tmpl b/module-pom.xml.tmpl
similarity index 80%
rename from opensaml-parent/module-pom.xml.tmpl
rename to module-pom.xml.tmpl
index 82a3155f1..c870cb378 100644
--- a/opensaml-parent/module-pom.xml.tmpl
+++ b/module-pom.xml.tmpl
@@ -7,8 +7,7 @@
<parent>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
+ <version>5.1.0-SNAPSHOT</version>
</parent>
<name>MVN_ARTF_ID</name>
@@ -37,11 +36,4 @@
<url>${shibboleth.scm.url}java-opensaml.git</url>
</scm>
- <distributionManagement>
- <site>
- <id>site</id>
- <url>dav:${opensaml-module.site.url}</url>
- </site>
- </distributionManagement>
-
</project>
diff --git a/opensaml-bom/pom.xml b/opensaml-bom/pom.xml
index aee77ee7d..ece786876 100644
--- a/opensaml-bom/pom.xml
+++ b/opensaml-bom/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: BOM</name>
diff --git a/opensaml-core-api/.checkstyle b/opensaml-core-api/.checkstyle
index c04bf97d7..e143505ba 100644
--- a/opensaml-core-api/.checkstyle
+++ b/opensaml-core-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-core-api/pom.xml b/opensaml-core-api/pom.xml
index 123efaa7b..b69043359 100644
--- a/opensaml-core-api/pom.xml
+++ b/opensaml-core-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Core API</name>
diff --git a/opensaml-core-impl/.checkstyle b/opensaml-core-impl/.checkstyle
index c04bf97d7..e143505ba 100644
--- a/opensaml-core-impl/.checkstyle
+++ b/opensaml-core-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-core-impl/pom.xml b/opensaml-core-impl/pom.xml
index 770364056..ad96bdb3c 100644
--- a/opensaml-core-impl/pom.xml
+++ b/opensaml-core-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Core Implementation</name>
diff --git a/opensaml-messaging-api/.checkstyle b/opensaml-messaging-api/.checkstyle
index c04bf97d7..e143505ba 100644
--- a/opensaml-messaging-api/.checkstyle
+++ b/opensaml-messaging-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-messaging-api/pom.xml b/opensaml-messaging-api/pom.xml
index d5b54a41b..57c647d9f 100644
--- a/opensaml-messaging-api/pom.xml
+++ b/opensaml-messaging-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Messaging API</name>
diff --git a/opensaml-messaging-impl/.checkstyle b/opensaml-messaging-impl/.checkstyle
index c04bf97d7..e143505ba 100644
--- a/opensaml-messaging-impl/.checkstyle
+++ b/opensaml-messaging-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-messaging-impl/pom.xml b/opensaml-messaging-impl/pom.xml
index b80222f2a..bcff7e091 100644
--- a/opensaml-messaging-impl/pom.xml
+++ b/opensaml-messaging-impl/pom.xml
@@ -1,49 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
- </parent>
+ <parent>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-parent</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
+ </parent>
- <name>OpenSAML :: Messaging Implementations</name>
+ <name>OpenSAML :: Messaging Implementations</name>
<description>Messaging Implementations</description>
<artifactId>opensaml-messaging-impl</artifactId>
- <packaging>jar</packaging>
+ <packaging>jar</packaging>
<properties>
<automatic.module.name>org.opensaml.messaging.impl</automatic.module.name>
</properties>
- <dependencies>
- <!-- Compile Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-core-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-messaging-api</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
- </dependency>
+ </dependency>
- <!-- Provided Dependencies -->
+ <!-- Provided Dependencies -->
- <!-- Runtime Dependencies -->
+ <!-- Runtime Dependencies -->
- <!-- Test Dependencies -->
-
- <!-- Needed for XMLObject providers -->
+ <!-- Test Dependencies -->
+
+ <!-- Needed for XMLObject providers -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>opensaml-core-impl</artifactId>
@@ -51,19 +50,19 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-testing</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>opensaml-testing</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
<scm>
<connection>${shibboleth.scm.connection}java-opensaml</connection>
diff --git a/opensaml-parent/.gitignore b/opensaml-parent/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/opensaml-parent/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/opensaml-parent/src/site/site.xml b/opensaml-parent/src/site/site.xml
deleted file mode 100644
index 872b40b7a..000000000
--- a/opensaml-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="OpenSAML" href="${opensaml-parent.site.url}" />
- </menu>
- <menu ref="modules" />
- </body>
-
-</project>
\ No newline at end of file
diff --git a/opensaml-profile-api/.checkstyle b/opensaml-profile-api/.checkstyle
index 1341b689b..e143505ba 100644
--- a/opensaml-profile-api/.checkstyle
+++ b/opensaml-profile-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="/opensaml-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-opensaml/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/opensaml-profile-api/pom.xml b/opensaml-profile-api/pom.xml
index 82ed8611b..3a77501ed 100644
--- a/opensaml-profile-api/pom.xml
+++ b/opensaml-profile-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Profile API</name>
diff --git a/opensaml-profile-impl/.checkstyle b/opensaml-profile-impl/.checkstyle
index 1341b689b..e143505ba 100644
--- a/opensaml-profile-impl/.checkstyle
+++ b/opensaml-profile-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="/opensaml-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-opensaml/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/opensaml-profile-impl/pom.xml b/opensaml-profile-impl/pom.xml
index 776e72f6a..a68537e30 100644
--- a/opensaml-profile-impl/pom.xml
+++ b/opensaml-profile-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Profile Implementations</name>
diff --git a/opensaml-saml-api/.checkstyle b/opensaml-saml-api/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-saml-api/.checkstyle
+++ b/opensaml-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-saml-api/pom.xml b/opensaml-saml-api/pom.xml
index b971264c7..a4ad0d926 100644
--- a/opensaml-saml-api/pom.xml
+++ b/opensaml-saml-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: SAML Provider API</name>
diff --git a/opensaml-saml-impl/.checkstyle b/opensaml-saml-impl/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-saml-impl/.checkstyle
+++ b/opensaml-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-saml-impl/pom.xml b/opensaml-saml-impl/pom.xml
index 6e00ec01c..945bc7636 100644
--- a/opensaml-saml-impl/pom.xml
+++ b/opensaml-saml-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: SAML Provider Implementations</name>
diff --git a/opensaml-security-api/.checkstyle b/opensaml-security-api/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-security-api/.checkstyle
+++ b/opensaml-security-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-security-api/pom.xml b/opensaml-security-api/pom.xml
index 9d7f4e7a0..141927878 100644
--- a/opensaml-security-api/pom.xml
+++ b/opensaml-security-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Security API</name>
diff --git a/opensaml-security-impl/.checkstyle b/opensaml-security-impl/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-security-impl/.checkstyle
+++ b/opensaml-security-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-security-impl/pom.xml b/opensaml-security-impl/pom.xml
index c309a9e7d..b1ee31688 100644
--- a/opensaml-security-impl/pom.xml
+++ b/opensaml-security-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Security Implementation</name>
diff --git a/opensaml-soap-api/.checkstyle b/opensaml-soap-api/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-soap-api/.checkstyle
+++ b/opensaml-soap-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-soap-api/pom.xml b/opensaml-soap-api/pom.xml
index b56a1768c..c80a3f286 100644
--- a/opensaml-soap-api/pom.xml
+++ b/opensaml-soap-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: SOAP Provider API</name>
diff --git a/opensaml-soap-impl/.checkstyle b/opensaml-soap-impl/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-soap-impl/.checkstyle
+++ b/opensaml-soap-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-soap-impl/pom.xml b/opensaml-soap-impl/pom.xml
index 110b458ce..ce034d5a7 100644
--- a/opensaml-soap-impl/pom.xml
+++ b/opensaml-soap-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: SOAP Provider Implementations</name>
diff --git a/opensaml-spring/.checkstyle b/opensaml-spring/.checkstyle
index c04bf97d7..e143505ba 100644
--- a/opensaml-spring/.checkstyle
+++ b/opensaml-spring/.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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-spring/pom.xml b/opensaml-spring/pom.xml
index c202edd62..8627320dc 100644
--- a/opensaml-spring/pom.xml
+++ b/opensaml-spring/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Spring Support</name>
diff --git a/opensaml-storage-api/.checkstyle b/opensaml-storage-api/.checkstyle
index 1341b689b..e143505ba 100644
--- a/opensaml-storage-api/.checkstyle
+++ b/opensaml-storage-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="/opensaml-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-opensaml/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/opensaml-storage-api/pom.xml b/opensaml-storage-api/pom.xml
index ad6a9778d..527f962ce 100644
--- a/opensaml-storage-api/pom.xml
+++ b/opensaml-storage-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Storage API</name>
diff --git a/opensaml-storage-impl/.checkstyle b/opensaml-storage-impl/.checkstyle
index 1341b689b..e143505ba 100644
--- a/opensaml-storage-impl/.checkstyle
+++ b/opensaml-storage-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="/opensaml-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-opensaml/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/opensaml-storage-impl/pom.xml b/opensaml-storage-impl/pom.xml
index bdd6c294f..58011cb6a 100644
--- a/opensaml-storage-impl/pom.xml
+++ b/opensaml-storage-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Storage Implementation</name>
diff --git a/opensaml-testing/.checkstyle b/opensaml-testing/.checkstyle
index c04bf97d7..e143505ba 100644
--- a/opensaml-testing/.checkstyle
+++ b/opensaml-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-testing/pom.xml b/opensaml-testing/pom.xml
index 7d5cc76b7..5b5a8f253 100644
--- a/opensaml-testing/pom.xml
+++ b/opensaml-testing/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: Testing</name>
diff --git a/opensaml-xacml-api/.checkstyle b/opensaml-xacml-api/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-xacml-api/.checkstyle
+++ b/opensaml-xacml-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-xacml-api/pom.xml b/opensaml-xacml-api/pom.xml
index 69ebc50bf..2c25834ac 100644
--- a/opensaml-xacml-api/pom.xml
+++ b/opensaml-xacml-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: XACML Provider API</name>
diff --git a/opensaml-xacml-impl/.checkstyle b/opensaml-xacml-impl/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-xacml-impl/.checkstyle
+++ b/opensaml-xacml-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-xacml-impl/pom.xml b/opensaml-xacml-impl/pom.xml
index 979f92ac6..96cad1dc5 100644
--- a/opensaml-xacml-impl/pom.xml
+++ b/opensaml-xacml-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: XACML Provider Implementations</name>
diff --git a/opensaml-xacml-saml-api/.checkstyle b/opensaml-xacml-saml-api/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-xacml-saml-api/.checkstyle
+++ b/opensaml-xacml-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-xacml-saml-api/pom.xml b/opensaml-xacml-saml-api/pom.xml
index d609155ef..d8a391314 100644
--- a/opensaml-xacml-saml-api/pom.xml
+++ b/opensaml-xacml-saml-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: SAML XACML Profile API</name>
diff --git a/opensaml-xacml-saml-impl/.checkstyle b/opensaml-xacml-saml-impl/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-xacml-saml-impl/.checkstyle
+++ b/opensaml-xacml-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-xacml-saml-impl/pom.xml b/opensaml-xacml-saml-impl/pom.xml
index 1b1ddac88..512ff6562 100644
--- a/opensaml-xacml-saml-impl/pom.xml
+++ b/opensaml-xacml-saml-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: SAML XACML Profile Implementation</name>
diff --git a/opensaml-xmlsec-api/.checkstyle b/opensaml-xmlsec-api/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-xmlsec-api/.checkstyle
+++ b/opensaml-xmlsec-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-xmlsec-api/pom.xml b/opensaml-xmlsec-api/pom.xml
index d23b8a9a3..737b8e18a 100644
--- a/opensaml-xmlsec-api/pom.xml
+++ b/opensaml-xmlsec-api/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: XML Security API</name>
diff --git a/opensaml-xmlsec-impl/.checkstyle b/opensaml-xmlsec-impl/.checkstyle
index 8f35f7823..e143505ba 100644
--- a/opensaml-xmlsec-impl/.checkstyle
+++ b/opensaml-xmlsec-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="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-opensaml/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/opensaml-xmlsec-impl/pom.xml b/opensaml-xmlsec-impl/pom.xml
index c19344ae0..b6ccf95d4 100644
--- a/opensaml-xmlsec-impl/pom.xml
+++ b/opensaml-xmlsec-impl/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
- <relativePath>../opensaml-parent</relativePath>
</parent>
<name>OpenSAML :: XML Security Implementation</name>
diff --git a/opensaml-parent/pom.xml b/pom.xml
similarity index 84%
rename from opensaml-parent/pom.xml
rename to pom.xml
index ed5e5548a..ca07857af 100644
--- a/opensaml-parent/pom.xml
+++ b/pom.xml
@@ -27,39 +27,39 @@
<packaging>pom</packaging>
<modules>
- <module>../opensaml-core-api</module>
- <module>../opensaml-storage-api</module>
- <module>../opensaml-security-api</module>
- <module>../opensaml-xmlsec-api</module>
- <module>../opensaml-messaging-api</module>
- <module>../opensaml-soap-api</module>
- <module>../opensaml-saml-api</module>
- <module>../opensaml-xacml-api</module>
- <module>../opensaml-xacml-saml-api</module>
- <module>../opensaml-profile-api</module>
-
- <module>../opensaml-core-impl</module>
- <module>../opensaml-storage-impl</module>
- <module>../opensaml-security-impl</module>
- <module>../opensaml-xmlsec-impl</module>
- <module>../opensaml-messaging-impl</module>
- <module>../opensaml-soap-impl</module>
- <module>../opensaml-saml-impl</module>
- <module>../opensaml-xacml-impl</module>
- <module>../opensaml-xacml-saml-impl</module>
- <module>../opensaml-profile-impl</module>
+ <module>opensaml-core-api</module>
+ <module>opensaml-storage-api</module>
+ <module>opensaml-security-api</module>
+ <module>opensaml-xmlsec-api</module>
+ <module>opensaml-messaging-api</module>
+ <module>opensaml-soap-api</module>
+ <module>opensaml-saml-api</module>
+ <module>opensaml-xacml-api</module>
+ <module>opensaml-xacml-saml-api</module>
+ <module>opensaml-profile-api</module>
+
+ <module>opensaml-core-impl</module>
+ <module>opensaml-storage-impl</module>
+ <module>opensaml-security-impl</module>
+ <module>opensaml-xmlsec-impl</module>
+ <module>opensaml-messaging-impl</module>
+ <module>opensaml-soap-impl</module>
+ <module>opensaml-saml-impl</module>
+ <module>opensaml-xacml-impl</module>
+ <module>opensaml-xacml-saml-impl</module>
+ <module>opensaml-profile-impl</module>
- <module>../opensaml-spring</module>
+ <module>opensaml-spring</module>
- <module>../opensaml-testing</module>
+ <module>opensaml-testing</module>
- <module>../opensaml-bom</module>
+ <module>opensaml-bom</module>
</modules>
<properties>
<shib-shared.groupId>net.shibboleth</shib-shared.groupId>
<shib-shared.version>9.1.0-SNAPSHOT</shib-shared.version>
- <checkstyle.configLocation>${project.basedir}/../opensaml-parent/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
+ <checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
</properties>
<!-- Dependencies which are required by every single project module should go here and will be inherited by all modules. -->
diff --git a/opensaml-parent/resources/checkstyle/checkstyle.xml b/resources/checkstyle/checkstyle.xml
similarity index 100%
rename from opensaml-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