From a99deef9db19a987b9a5794d649821b725183239 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 17 May 2023 10:17:59 -0400 Subject: [PATCH 1/4] [pom] Set maven plugin annotations to 3.9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c3302689..783e3afa 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.6.4 + 3.9.0 provided From 7b5d2f7ec73fed2315ce5b12c7a616cf9ecffe6e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 17 May 2023 11:07:19 -0400 Subject: [PATCH 2/4] [maven] Bump file-management to 3.1.0 and let it create its own slf4j logger note maven really is slf4j internally as well but rather that clutter space here, just let it create internally --- pom.xml | 2 +- .../org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java | 2 +- .../codehaus/gmavenplus/mojo/AbstractGroovySourcesMojo.java | 4 ++-- .../gmavenplus/mojo/AbstractGroovyStubSourcesMojo.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 783e3afa..4d211755 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.shared file-management - 3.0.0 + 3.1.0 org.apache.maven.plugin-tools diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java index 3236efcb..77251f70 100644 --- a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java +++ b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java @@ -313,7 +313,7 @@ protected synchronized void doGroovyDocGeneration(final FileSet[] sourceDirector Properties docProperties = setupProperties(); Object fileOutputTool = invokeConstructor(findConstructor(fileOutputToolClass)); Object classpathResourceManager = invokeConstructor(findConstructor(classpathResourceManagerClass)); - FileSetManager fileSetManager = new FileSetManager(getLog()); + FileSetManager fileSetManager = new FileSetManager(); List sourceDirectoriesStrings = new ArrayList<>(); for (FileSet sourceDirectory : sourceDirectories) { sourceDirectoriesStrings.add(sourceDirectory.getDirectory()); diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovySourcesMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovySourcesMojo.java index 9464db15..fcedb1af 100644 --- a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovySourcesMojo.java +++ b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovySourcesMojo.java @@ -52,7 +52,7 @@ public abstract class AbstractGroovySourcesMojo extends AbstractGroovyMojo { */ protected SortedSet getFiles(final FileSet[] fromSources, final boolean includeJavaSources) { SortedSet files = new TreeSet<>(); - FileSetManager fileSetManager = new FileSetManager(getLog()); + FileSetManager fileSetManager = new FileSetManager(); for (FileSet fileSet : getFilesets(fromSources, includeJavaSources)) { for (String include : fileSetManager.getIncludedFiles(fileSet)) { @@ -72,7 +72,7 @@ protected SortedSet getFiles(final FileSet[] fromSources, final boolean in */ protected SortedSet getTestFiles(final FileSet[] fromSources, final boolean includeJavaSources) { SortedSet files = new TreeSet<>(); - FileSetManager fileSetManager = new FileSetManager(getLog()); + FileSetManager fileSetManager = new FileSetManager(); for (FileSet fileSet : getTestFilesets(fromSources, includeJavaSources)) { for (String include : fileSetManager.getIncludedFiles(fileSet)) { diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyStubSourcesMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyStubSourcesMojo.java index be98b773..f98bfa35 100644 --- a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyStubSourcesMojo.java +++ b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyStubSourcesMojo.java @@ -42,7 +42,7 @@ public abstract class AbstractGroovyStubSourcesMojo extends AbstractGroovySource */ protected Set getStubs(File outputDirectory) { Set files = new HashSet<>(); - FileSetManager fileSetManager = new FileSetManager(getLog()); + FileSetManager fileSetManager = new FileSetManager(); FileSet fileSet = new FileSet(); fileSet.setDirectory(outputDirectory.getAbsolutePath()); From 676e42019a53eb90f621dbe4813da4c46c391fef Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 17 May 2023 11:25:01 -0400 Subject: [PATCH 3/4] [git] Add .factorypath to git ignore for eclipse --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c08b52b7..c0048e05 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ target # Eclipse +.factorypath .settings *.classpath *.project From 8d54a463fc7f0f9f8a38aaa2d492d69c2b5e1e8a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 17 May 2023 11:25:29 -0400 Subject: [PATCH 4/4] [pom] Remove now unnecessary overrides of maven artifacts --- pom.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pom.xml b/pom.xml index 4d211755..f3721acc 100644 --- a/pom.xml +++ b/pom.xml @@ -35,12 +35,6 @@ ${mavenVersion} provided - - org.apache.maven - maven-compat - ${mavenVersion} - provided - org.apache.maven maven-core @@ -53,24 +47,12 @@ ${mavenVersion} provided - - org.apache.maven - maven-model-builder - ${mavenVersion} - provided - org.apache.maven maven-plugin-api ${mavenVersion} provided - - org.apache.maven - maven-settings - ${mavenVersion} - provided - org.apache.maven.shared file-management