[java-metadata-aggregator] branch main updated: MDA-262 - Move Maven parent project to root
Ian Young
ian at iay.org.uk
Tue Aug 24 12:52:59 UTC 2021
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=346c80c3664fad7d81d44fe3e8d3068823f42ce6
The following commit(s) were added to refs/heads/main by this push:
new 346c80c MDA-262 - Move Maven parent project to root
346c80c is described below
commit 346c80c3664fad7d81d44fe3e8d3068823f42ce6
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Aug 24 13:52:55 2021 +0100
MDA-262 - Move Maven parent project to root
https://shibboleth.atlassian.net/browse/MDA-262
---
.project | 6 +++++-
.../org.eclipse.core.resources.prefs | 0
.../.settings => .settings}/org.eclipse.m2e.core.prefs | 0
.../.settings => .settings}/org.maven.ide.eclipse.prefs | 0
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
aggregator-blacklists/pom.xml | 1 -
aggregator-bom/pom.xml | 1 -
aggregator-cli/.settings/org.eclipse.jdt.core.prefs | 2 +-
aggregator-cli/pom.xml | 1 -
aggregator-parent/.project | 15 ---------------
aggregator-pipeline/.settings/org.eclipse.jdt.core.prefs | 2 +-
aggregator-pipeline/pom.xml | 1 -
{aggregator-parent/doc => doc}/LICENSE.txt | 0
aggregator-parent/pom.xml => pom.xml | 10 +++++-----
.../resources => resources}/checkstyle/checkstyle.xml | 0
.../eclipse/settings/org.eclipse.core.resources.prefs | 0
.../eclipse/settings/org.eclipse.jdt.core.prefs | 0
.../eclipse/settings/org.eclipse.jdt.ui.prefs | 0
.../eclipse/settings/org.eclipse.m2e.core.prefs | 0
{aggregator-parent/src => src}/site/site.xml | 0
20 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/.project b/.project
index b5e156b..3dc3d8c 100644
--- a/.project
+++ b/.project
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>java-metadata-aggregator</name>
+ <name>aggregator-parent</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
diff --git a/aggregator-parent/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from aggregator-parent/.settings/org.eclipse.core.resources.prefs
rename to .settings/org.eclipse.core.resources.prefs
diff --git a/aggregator-parent/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from aggregator-parent/.settings/org.eclipse.m2e.core.prefs
rename to .settings/org.eclipse.m2e.core.prefs
diff --git a/aggregator-parent/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from aggregator-parent/.settings/org.maven.ide.eclipse.prefs
rename to .settings/org.maven.ide.eclipse.prefs
diff --git a/aggregator-blacklists/.settings/org.eclipse.jdt.core.prefs b/aggregator-blacklists/.settings/org.eclipse.jdt.core.prefs
index 7fa508c..af08edf 100644
--- a/aggregator-blacklists/.settings/org.eclipse.jdt.core.prefs
+++ b/aggregator-blacklists/.settings/org.eclipse.jdt.core.prefs
@@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/aggregator-blacklists/pom.xml b/aggregator-blacklists/pom.xml
index 9bde718..4e9579a 100644
--- a/aggregator-blacklists/pom.xml
+++ b/aggregator-blacklists/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.metadata</groupId>
<artifactId>aggregator-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
- <relativePath>../aggregator-parent</relativePath>
</parent>
<name>Shibboleth Metadata Aggregator :: RSA Key Blacklists</name>
diff --git a/aggregator-bom/pom.xml b/aggregator-bom/pom.xml
index 07c7a8f..ebf26b8 100644
--- a/aggregator-bom/pom.xml
+++ b/aggregator-bom/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.metadata</groupId>
<artifactId>aggregator-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
- <relativePath>../aggregator-parent</relativePath>
</parent>
<name>Shibboleth Metadata Aggregator :: BOM</name>
diff --git a/aggregator-cli/.settings/org.eclipse.jdt.core.prefs b/aggregator-cli/.settings/org.eclipse.jdt.core.prefs
index 7fa508c..af08edf 100644
--- a/aggregator-cli/.settings/org.eclipse.jdt.core.prefs
+++ b/aggregator-cli/.settings/org.eclipse.jdt.core.prefs
@@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/aggregator-cli/pom.xml b/aggregator-cli/pom.xml
index feee6e4..6d57db4 100644
--- a/aggregator-cli/pom.xml
+++ b/aggregator-cli/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.metadata</groupId>
<artifactId>aggregator-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
- <relativePath>../aggregator-parent</relativePath>
</parent>
<name>Shibboleth Metadata Aggregator :: Command Line Interface</name>
diff --git a/aggregator-parent/.project b/aggregator-parent/.project
deleted file mode 100644
index 3dc3d8c..0000000
--- a/aggregator-parent/.project
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>aggregator-parent</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/aggregator-pipeline/.settings/org.eclipse.jdt.core.prefs b/aggregator-pipeline/.settings/org.eclipse.jdt.core.prefs
index 7fa508c..af08edf 100644
--- a/aggregator-pipeline/.settings/org.eclipse.jdt.core.prefs
+++ b/aggregator-pipeline/.settings/org.eclipse.jdt.core.prefs
@@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/aggregator-pipeline/pom.xml b/aggregator-pipeline/pom.xml
index 42a7830..32fa15c 100644
--- a/aggregator-pipeline/pom.xml
+++ b/aggregator-pipeline/pom.xml
@@ -8,7 +8,6 @@
<groupId>net.shibboleth.metadata</groupId>
<artifactId>aggregator-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
- <relativePath>../aggregator-parent</relativePath>
</parent>
<name>Shibboleth Metadata Aggregator :: Processing Pipeline</name>
diff --git a/aggregator-parent/doc/LICENSE.txt b/doc/LICENSE.txt
similarity index 100%
rename from aggregator-parent/doc/LICENSE.txt
rename to doc/LICENSE.txt
diff --git a/aggregator-parent/pom.xml b/pom.xml
similarity index 95%
rename from aggregator-parent/pom.xml
rename to pom.xml
index dd15e9a..3752f21 100644
--- a/aggregator-parent/pom.xml
+++ b/pom.xml
@@ -25,16 +25,16 @@
<packaging>pom</packaging>
<modules>
- <module>../aggregator-blacklists</module>
- <module>../aggregator-pipeline</module>
- <module>../aggregator-cli</module>
- <module>../aggregator-bom</module>
+ <module>aggregator-blacklists</module>
+ <module>aggregator-pipeline</module>
+ <module>aggregator-cli</module>
+ <module>aggregator-bom</module>
</modules>
<properties>
<java-support.version>8.2.1</java-support.version>
<spring-extensions.version>6.1.2</spring-extensions.version>
- <checkstyle.configLocation>${project.basedir}/../aggregator-parent/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
<aggregator-parent.site.url>${shibboleth.site.deploy.url}java-metadata-aggregator/${project.version}/</aggregator-parent.site.url>
<aggregator-module.site.url>${aggregator-parent.site.url}${project.artifactId}</aggregator-module.site.url>
</properties>
diff --git a/aggregator-parent/resources/checkstyle/checkstyle.xml b/resources/checkstyle/checkstyle.xml
similarity index 100%
rename from aggregator-parent/resources/checkstyle/checkstyle.xml
rename to resources/checkstyle/checkstyle.xml
diff --git a/aggregator-parent/resources/eclipse/settings/org.eclipse.core.resources.prefs b/resources/eclipse/settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from aggregator-parent/resources/eclipse/settings/org.eclipse.core.resources.prefs
rename to resources/eclipse/settings/org.eclipse.core.resources.prefs
diff --git a/aggregator-parent/resources/eclipse/settings/org.eclipse.jdt.core.prefs b/resources/eclipse/settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from aggregator-parent/resources/eclipse/settings/org.eclipse.jdt.core.prefs
rename to resources/eclipse/settings/org.eclipse.jdt.core.prefs
diff --git a/aggregator-parent/resources/eclipse/settings/org.eclipse.jdt.ui.prefs b/resources/eclipse/settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from aggregator-parent/resources/eclipse/settings/org.eclipse.jdt.ui.prefs
rename to resources/eclipse/settings/org.eclipse.jdt.ui.prefs
diff --git a/aggregator-parent/resources/eclipse/settings/org.eclipse.m2e.core.prefs b/resources/eclipse/settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from aggregator-parent/resources/eclipse/settings/org.eclipse.m2e.core.prefs
rename to resources/eclipse/settings/org.eclipse.m2e.core.prefs
diff --git a/aggregator-parent/src/site/site.xml b/src/site/site.xml
similarity index 100%
rename from aggregator-parent/src/site/site.xml
rename to src/site/site.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list