From 832415c1018ef0814fd332676d9d169d1111315b Mon Sep 17 00:00:00 2001 From: Yevgeny Kazakov Date: Fri, 17 May 2024 11:59:16 +0200 Subject: [PATCH 1/5] Fix the version of maven-resources-plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e79a3443..764645285 100644 --- a/pom.xml +++ b/pom.xml @@ -558,7 +558,7 @@ OSGi Framework launcher). --> maven-resources-plugin - 3.9.6 + 3.3.1 copy-resources From 13003d0aec32bc81b467f26aaa57628bd6af4faf Mon Sep 17 00:00:00 2001 From: Yevgeny Kazakov Date: Fri, 17 May 2024 12:01:26 +0200 Subject: [PATCH 2/5] Specify the version of all plugins in the pluginManagement section this should preventing using a wrong plugin version by accident even if the plugin is not used --- pom.xml | 69 ++++++++++++++++++++++++++++++-------- protege-desktop/pom.xml | 2 -- protege-editor-owl/pom.xml | 1 - 3 files changed, 55 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 764645285..a97f573f4 100644 --- a/pom.xml +++ b/pom.xml @@ -400,6 +400,59 @@ maven-surefire-plugin 3.2.5 + + + maven-resources-plugin + 3.3.1 + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.1 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.3 + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + + + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.2.5 + @@ -417,7 +470,6 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 attach-sources @@ -431,7 +483,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 attach-javadocs @@ -449,7 +500,6 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 sign-artifacts @@ -463,8 +513,7 @@ org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + nexus-staging-maven-plugin true @@ -494,11 +543,6 @@ - - - org.eclipse.m2e lifecycle-mapping @@ -538,8 +582,7 @@ in Eclipse (PDE + m2e + OSGi Framework launcher). --> org.apache.maven.plugins - maven-dependency-plugin - 3.6.1 + maven-dependency-plugin copy-provided-dependencies @@ -558,7 +601,6 @@ OSGi Framework launcher). --> maven-resources-plugin - 3.3.1 copy-resources @@ -585,7 +627,6 @@ org.apache.maven.plugins maven-clean-plugin - 2.5 diff --git a/protege-desktop/pom.xml b/protege-desktop/pom.xml index cb809916f..3bec9f129 100644 --- a/protege-desktop/pom.xml +++ b/protege-desktop/pom.xml @@ -133,7 +133,6 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 compile @@ -151,7 +150,6 @@ maven-assembly-plugin - 3.6.0 protege-desktop-assembly diff --git a/protege-editor-owl/pom.xml b/protege-editor-owl/pom.xml index eecef0f2c..afb79ca12 100644 --- a/protege-editor-owl/pom.xml +++ b/protege-editor-owl/pom.xml @@ -236,7 +236,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.5 verify From 3f9b75ef22d4a1c4f42d55422079df266e73b8e8 Mon Sep 17 00:00:00 2001 From: Yevgeny Kazakov Date: Fri, 17 May 2024 12:05:05 +0200 Subject: [PATCH 3/5] The m2e livecycle-mapping for maven-bundle-pluginis no longer needed Looks like m2e supports maven-bundle-plugin --- pom.xml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pom.xml b/pom.xml index a97f573f4..b3fce7b36 100644 --- a/pom.xml +++ b/pom.xml @@ -543,30 +543,6 @@ - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [3.1,) - - copy-dependencies - - - - - - - - - - org.apache.felix maven-bundle-plugin From 998e5a07276ed1034be5586d143001428a1ce498 Mon Sep 17 00:00:00 2001 From: Yevgeny Kazakov Date: Fri, 17 May 2024 12:28:25 +0200 Subject: [PATCH 4/5] Specify minimal maven version to make builds more reproducible --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pom.xml b/pom.xml index b3fce7b36..411a09921 100644 --- a/pom.xml +++ b/pom.xml @@ -345,6 +345,11 @@ + + maven-enforcer-plugin + 3.4.1 + + org.apache.maven.plugins maven-compiler-plugin @@ -456,6 +461,27 @@ + + + + maven-enforcer-plugin + + + enforce-maven + + enforce + + + + + 3.6.3 + + + + + + + From f7a0e50cad0ec27f569197e25974c35f8d98065e Mon Sep 17 00:00:00 2001 From: Yevgeny Kazakov Date: Fri, 17 May 2024 13:02:31 +0200 Subject: [PATCH 5/5] Bump plugin versions except for maven-bundle-plugin, for which the new versions do not work --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 411a09921..246145bcb 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.13.0 11 @@ -414,7 +414,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 @@ -432,7 +432,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.2.4 @@ -444,7 +444,7 @@ org.apache.maven.plugins maven-clean-plugin - 2.5 + 3.3.2