From 75dd8143cf0960a247740ec49ba3a6520a7c3b2a Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Mon, 28 Aug 2023 20:35:28 +0200 Subject: [PATCH] Move all plugin config to global parent and clean up other parents --- build-parent/pom.xml | 70 ------------------- .../gradle/gradle-application-plugin/pom.xml | 1 - .../gradle/gradle-extension-plugin/pom.xml | 3 +- .../spring-web/resteasy-classic/tests/pom.xml | 1 - .../resteasy-reactive/tests/pom.xml | 1 - independent-projects/arc/pom.xml | 63 ----------------- independent-projects/arc/tests/pom.xml | 1 - independent-projects/bootstrap/pom.xml | 68 ------------------ independent-projects/enforcer-rules/pom.xml | 63 ----------------- .../extension-maven-plugin/pom.xml | 68 ------------------ independent-projects/parent/pom.xml | 27 +++++++ .../resteasy-reactive/pom.xml | 63 ----------------- independent-projects/tools/pom.xml | 68 ------------------ integration-tests/pom.xml | 1 - .../pom.xml | 1 - .../test-extension/extension/pom.xml | 1 - integration-tests/virtual-threads/pom.xml | 1 - pom.xml | 68 ------------------ tcks/pom.xml | 1 - 19 files changed, 28 insertions(+), 542 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 8922f4e9092ff..7d073c2aa8d26 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -844,76 +844,6 @@ - - - release - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - https://s01.oss.sonatype.org/ - ossrh - false - true - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - dokka diff --git a/devtools/gradle/gradle-application-plugin/pom.xml b/devtools/gradle/gradle-application-plugin/pom.xml index f509c3e126758..403d63c5ab140 100644 --- a/devtools/gradle/gradle-application-plugin/pom.xml +++ b/devtools/gradle/gradle-application-plugin/pom.xml @@ -82,7 +82,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true diff --git a/devtools/gradle/gradle-extension-plugin/pom.xml b/devtools/gradle/gradle-extension-plugin/pom.xml index 167202ad095dd..78cf5a5a51acf 100644 --- a/devtools/gradle/gradle-extension-plugin/pom.xml +++ b/devtools/gradle/gradle-extension-plugin/pom.xml @@ -54,11 +54,10 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true - \ No newline at end of file + diff --git a/extensions/spring-web/resteasy-classic/tests/pom.xml b/extensions/spring-web/resteasy-classic/tests/pom.xml index 0a2d62f28fa83..11a817c0c5d5b 100644 --- a/extensions/spring-web/resteasy-classic/tests/pom.xml +++ b/extensions/spring-web/resteasy-classic/tests/pom.xml @@ -55,7 +55,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true diff --git a/extensions/spring-web/resteasy-reactive/tests/pom.xml b/extensions/spring-web/resteasy-reactive/tests/pom.xml index ba357ab66af96..4165d38d819d8 100644 --- a/extensions/spring-web/resteasy-reactive/tests/pom.xml +++ b/extensions/spring-web/resteasy-reactive/tests/pom.xml @@ -59,7 +59,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml index f360d120244bd..439491816fc80 100644 --- a/independent-projects/arc/pom.xml +++ b/independent-projects/arc/pom.xml @@ -67,7 +67,6 @@ 3.11.0 3.2.1 3.1.2 - 1.6.8 @@ -342,68 +341,6 @@ true - - release - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - https://s01.oss.sonatype.org/ - ossrh - false - true - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - format diff --git a/independent-projects/arc/tests/pom.xml b/independent-projects/arc/tests/pom.xml index f26613fc99119..b5e79a575f83e 100644 --- a/independent-projects/arc/tests/pom.xml +++ b/independent-projects/arc/tests/pom.xml @@ -80,7 +80,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml index 4c0d1072332e5..1236a615edb48 100644 --- a/independent-projects/bootstrap/pom.xml +++ b/independent-projects/bootstrap/pom.xml @@ -40,7 +40,6 @@ 3.11.0 3.2.1 3.1.2 - 1.6.8 3.1.3 @@ -283,73 +282,6 @@ true - - release - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - https://s01.oss.sonatype.org/ - ossrh - false - true - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - format diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml index c2f3e5d6274bf..e7a5826dae2e6 100644 --- a/independent-projects/enforcer-rules/pom.xml +++ b/independent-projects/enforcer-rules/pom.xml @@ -42,7 +42,6 @@ 3.6.0 3.8.8 - 1.6.8 @@ -211,68 +210,6 @@ true - - release - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - https://s01.oss.sonatype.org/ - ossrh - false - true - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - format diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml index 55adab6682577..6f8820fb8e911 100644 --- a/independent-projects/extension-maven-plugin/pom.xml +++ b/independent-projects/extension-maven-plugin/pom.xml @@ -41,7 +41,6 @@ 3.11.0 3.2.1 3.1.2 - 1.6.8 3.8.1 2.15.2 1.3.2 @@ -476,73 +475,6 @@ true - - release - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - https://s01.oss.sonatype.org/ - ossrh - false - true - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - format diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index 6b32a582213ab..560466ba3468f 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -697,6 +697,31 @@ org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins maven-gpg-plugin @@ -757,6 +782,8 @@ https://s01.oss.sonatype.org/ ossrh + true + true 60 diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index db702dcaf0ecc..b66f8eafb0323 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -61,7 +61,6 @@ 3.11.0 3.2.1 3.1.2 - 1.6.8 2.4.0 2.1.2 4.4.5 @@ -586,68 +585,6 @@ true - - release - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - https://s01.oss.sonatype.org/ - ossrh - false - true - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - format diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index f6a954498313c..9fdf19df1d301 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -60,7 +60,6 @@ 5.3.1 3.2.1 3.1.2 - 1.6.8 ${project.version} 25 3.1.3 @@ -344,73 +343,6 @@ true - - release - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - https://s01.oss.sonatype.org/ - ossrh - true - true - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - format diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 2a276c31810e8..53fb7c2b88a68 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -58,7 +58,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true diff --git a/integration-tests/test-extension/extension-that-defines-junit-test-extensions/pom.xml b/integration-tests/test-extension/extension-that-defines-junit-test-extensions/pom.xml index 6b988bd6524d4..098a40bf6ea35 100644 --- a/integration-tests/test-extension/extension-that-defines-junit-test-extensions/pom.xml +++ b/integration-tests/test-extension/extension-that-defines-junit-test-extensions/pom.xml @@ -28,7 +28,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true diff --git a/integration-tests/test-extension/extension/pom.xml b/integration-tests/test-extension/extension/pom.xml index d2d462cb386ef..9ccf2cc5c4d43 100644 --- a/integration-tests/test-extension/extension/pom.xml +++ b/integration-tests/test-extension/extension/pom.xml @@ -28,7 +28,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true diff --git a/integration-tests/virtual-threads/pom.xml b/integration-tests/virtual-threads/pom.xml index 3b56ac4f95d08..1027278c76895 100644 --- a/integration-tests/virtual-threads/pom.xml +++ b/integration-tests/virtual-threads/pom.xml @@ -71,7 +71,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true diff --git a/pom.xml b/pom.xml index 2574b2a868f50..093edfca0e11d 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,6 @@ ${env.GRAALVM_HOME} jdbc:postgresql:hibernate_orm_test - 1.6.8 4.5.0 0.0.93 @@ -253,73 +252,6 @@ relocations - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - https://s01.oss.sonatype.org/ - ossrh - true - true - 60 - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - tcks diff --git a/tcks/pom.xml b/tcks/pom.xml index cab353810baae..d6ffca4d59489 100644 --- a/tcks/pom.xml +++ b/tcks/pom.xml @@ -49,7 +49,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} true