From b7edb3f512cb45e7f11c1f2306b434539d767a35 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Jan 2020 22:02:58 -0500 Subject: [PATCH 01/12] [pom] Add a valid usage of relativePath to force .m2 lookup The root is not oss-parent. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 626da5ba..b445f569 100644 --- a/pom.xml +++ b/pom.xml @@ -5,6 +5,7 @@ org.sonatype.oss oss-parent 9 + io.github.git-commit-id From 976f697ea7137d1e89d7e25f6f6812391e50736d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Jan 2020 22:06:48 -0500 Subject: [PATCH 02/12] [pom] Remove comment regarding now unused cobertura While true, that isn't going to be fixed. Jaccoc has been the defaco for years now. The comment itself serves no purpose here as it's completely unlikely this will ever be switched back. Cobertura doesn't support java 8. We are at 13 now and 14 in 3 months. The cobertura project is long EOL. Also, project is nearly 5 years without a commit. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index b445f569..68e9138b 100644 --- a/pom.xml +++ b/pom.xml @@ -457,7 +457,6 @@ - org.jacoco jacoco-maven-plugin From 5cf53d586582f24029faee62ebd017278735f7d4 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 18:02:08 -0400 Subject: [PATCH 03/12] [pom] Set maven to 3.9.0 (all are provided so it can be this high now) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 68e9138b..1941a791 100644 --- a/pom.xml +++ b/pom.xml @@ -47,8 +47,8 @@ 11 - 3.1.0-alpha-1 - 3.6.0 + 3.9.0 + 3.9.0 4.13.2 5.1.1 From 297cbc395c124748d8e36e448a45e2466164d7e7 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 18:02:35 -0400 Subject: [PATCH 04/12] [pom] Update all plugins --- pom.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 1941a791..29d74221 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ maven-assembly-plugin - 3.4.2 + 3.6.0 maven-dependency-plugin @@ -110,15 +110,15 @@ maven-release-plugin - 3.0.0-M7 + 3.0.0 maven-enforcer-plugin - 3.2.1 + 3.3.0 maven-compiler-plugin - 3.8.1 + 3.11.0 maven-gpg-plugin @@ -126,15 +126,15 @@ maven-clean-plugin - 3.1.0 + 3.2.0 maven-resources-plugin - 3.1.0 + 3.3.1 maven-jar-plugin - 3.2.0 + 3.3.0 maven-plugin-plugin @@ -146,7 +146,7 @@ maven-install-plugin - 2.5.2 + 3.1.1 maven-deploy-plugin @@ -158,7 +158,7 @@ maven-javadoc-plugin - 3.2.0 + 3.5.0 maven-source-plugin @@ -444,9 +444,9 @@ - org.eluder.coveralls + io.jsonwebtoken.coveralls coveralls-maven-plugin - 4.3.0 + 4.4.1 @@ -460,7 +460,7 @@ org.jacoco jacoco-maven-plugin - 0.8.2 + 0.8.10 prepare-agent @@ -476,7 +476,7 @@ checkstyle - 3.1.0 + 3.2.2 8.25 ${basedir}/.github/.checkstyle From acdb9d51a793cd28b932f523ccf3e45c3973e092 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 18:03:05 -0400 Subject: [PATCH 05/12] [pom] Use maven property prefixes for basedir --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 29d74221..6e200a19 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ - src/main/resources + ${project.basedir}/src/main/resources true **/*.properties @@ -86,7 +86,7 @@ - src/test/resources + ${project.basedir}/src/test/resources _git_*/** README.md From 773aa5db53c970d768f7f65dce75f7918aa6c8d4 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 18:03:17 -0400 Subject: [PATCH 06/12] [pom] Bump bind api to 2.3.3 (still javaEE) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6e200a19..d416e6b2 100644 --- a/pom.xml +++ b/pom.xml @@ -451,9 +451,9 @@ - javax.xml.bind - jaxb-api - 2.2.3 + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 From 500384efd0a2b9e0c7ae53653a3af0788b585565 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 20:06:22 -0400 Subject: [PATCH 07/12] [javadocs] Fix code tags --- src/main/java/pl/project13/maven/git/GitCommitIdMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java b/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java index 82d0e650..68e9c218 100644 --- a/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java +++ b/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java @@ -927,8 +927,8 @@ public class GitCommitIdMojo extends AbstractMojo { * of the input/output property. * This behaviour can be achieved by defining a list of {@code transformationRules} for * the property where those rules should take effect. - * Each {@code transformationRule} consist of two required fields {@cdoe apply} and {@code action}. - * The {@cdoe apply}-tag controls when the rule should be applied and can be set to {@code BEFORE} + * Each {@code transformationRule} consist of two required fields {@code apply} and {@code action}. + * The {@code apply}-tag controls when the rule should be applied and can be set to {@code BEFORE} * to have the rule being applied before or it can be set to {@code AFTER} to have the * rule being applied after the replacement. * The {@code action}-tag determines the string conversion rule that should be applied. From bfce13427280dad889fe564b6f58d381f0905c2b Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 20:11:45 -0400 Subject: [PATCH 08/12] [pom] Override two plugins in obsolete oss parent --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index d416e6b2..377fe6dd 100644 --- a/pom.xml +++ b/pom.xml @@ -168,6 +168,16 @@ + + + maven-enforcer-plugin + 3.3.0 + + + maven-release-plugin + 3.0.0 + + From 8670e2ac90769f61cd47a24db64960134aaa2cf5 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 20:16:33 -0400 Subject: [PATCH 09/12] [pom] Still allow maven 3.1.0-alpha-1 to build with --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 377fe6dd..a0241f5b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - [${maven-plugin-api.version},) + [3.1.0-alpha-1,) From f191383971ed2f78aec0e149116d7446cbd86456 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 20:18:28 -0400 Subject: [PATCH 10/12] [pom] Set maven plugin api to 3.9.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0241f5b..3a40d2a5 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 11 - 3.9.0 + 3.9.2 3.9.0 4.13.2 From 716cb3e1d98136cf12043bc5592b724f19f66f18 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 20:53:10 -0400 Subject: [PATCH 11/12] [pom] Require at least maven 3.2.5 which aligns with maven in general There is no real reason to support prior to this and maven core plugins are starting to require at least this level. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a40d2a5..85a3ce85 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - [3.1.0-alpha-1,) + [3.2.5,) From d3a3ff25d0bb0a595bcbff9899edad6f25370f9e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 15 May 2023 18:09:07 -0400 Subject: [PATCH 12/12] [GHA] Drop maven 3.1.0 / 3.1.1 as not supported, add 3.9.2 Most of maven requires at least 3.2.5 now. Many are at 3.3.9 or better. There is no reason to support such old 3.1.1 or before. --- .github/workflows/default-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/default-tests.yml b/.github/workflows/default-tests.yml index aee98617..c9f33a9b 100644 --- a/.github/workflows/default-tests.yml +++ b/.github/workflows/default-tests.yml @@ -59,7 +59,7 @@ jobs: strategy: matrix: java_version: ['11'] - maven_version: ['3.1.0-alpha-1', '3.1.1', '3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.8', '3.9.1', '4.0.0-alpha-5'] + maven_version: ['3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.8', '3.9.1', '3.9.2', '4.0.0-alpha-5'] steps: - uses: actions/checkout@v3