From 606288fda436963491252ad379e15ad8121bcb14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCnger?= Date: Mon, 14 Apr 2025 17:28:16 +0200 Subject: [PATCH 1/4] Update parent to 44 Update of JUnit also, otherwise JUnit was not able to find tests (anymore) --- pom.xml | 4 ++-- .../maven/plugins/source/SourceJarMojoTest.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 1212c60..b755e59 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins - 42 + 44 @@ -81,7 +81,7 @@ under the License. 4.0.0-beta-3 6.0.0 - 5.10.2 + 5.12.2 4.0.0-beta-1 4.0.0-beta-1 4.0.0-beta-1 diff --git a/src/test/java/org/apache/maven/plugins/source/SourceJarMojoTest.java b/src/test/java/org/apache/maven/plugins/source/SourceJarMojoTest.java index 58e170e..faed337 100644 --- a/src/test/java/org/apache/maven/plugins/source/SourceJarMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/source/SourceJarMojoTest.java @@ -48,16 +48,16 @@ public class SourceJarMojoTest extends AbstractSourcePluginTestCase { private String[] addMavenDescriptor(String project, String... listOfElements) { - final String METAINF = "META-INF/"; - final String MAVENSOURCE = "maven/source/maven-source-plugin-test-"; + final String metainf = "META-INF/"; + final String mavensource = "maven/source/maven-source-plugin-test-"; int length = listOfElements.length; String[] result = new String[length + 5]; System.arraycopy(listOfElements, 0, result, 0, length); - result[length] = METAINF + "maven/"; - result[length + 1] = METAINF + "maven/source/"; - result[length + 2] = METAINF + MAVENSOURCE + project + "/"; - result[length + 3] = METAINF + MAVENSOURCE + project + "/pom.properties"; - result[length + 4] = METAINF + MAVENSOURCE + project + "/pom.xml"; + result[length] = metainf + "maven/"; + result[length + 1] = metainf + "maven/source/"; + result[length + 2] = metainf + mavensource + project + "/"; + result[length + 3] = metainf + mavensource + project + "/pom.properties"; + result[length + 4] = metainf + mavensource + project + "/pom.xml"; return result; } From 9d893240c5297aff6377af1bb9577de06e8e9940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCnger?= Date: Mon, 14 Apr 2025 17:40:58 +0200 Subject: [PATCH 2/4] Fix site --- src/site/site.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/site/site.xml b/src/site/site.xml index b9438e3..99038f2 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -36,4 +36,10 @@ under the License. + + + org.apache.maven.skins + maven-fluido-skin + 2.1.0 + From ecd77d13b70c63518a6ed3785684426c279e0580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCnger?= Date: Tue, 15 Apr 2025 08:12:36 +0200 Subject: [PATCH 3/4] Take versions from parent --- pom.xml | 2 -- src/site/site.xml | 1 - 2 files changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index b755e59..24e9c15 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,6 @@ under the License. 4.0.0-beta-3 6.0.0 - 5.12.2 4.0.0-beta-1 4.0.0-beta-1 4.0.0-beta-1 @@ -176,7 +175,6 @@ under the License. org.junit.jupiter junit-jupiter-api - ${junitVersion} test diff --git a/src/site/site.xml b/src/site/site.xml index 99038f2..6d77729 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -40,6 +40,5 @@ under the License. org.apache.maven.skins maven-fluido-skin - 2.1.0 From ab608eeb74f1961e9c7905014dbd6cad44cf31f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCnger?= Date: Tue, 15 Apr 2025 17:36:55 +0200 Subject: [PATCH 4/4] Remove from site --- src/site/site.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/site/site.xml b/src/site/site.xml index 6d77729..b9438e3 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -36,9 +36,4 @@ under the License. - - - org.apache.maven.skins - maven-fluido-skin -