Merge pull request #246 from hazendaz/master

Upgrade file-management and cleanup build
groovy · May 17, 2023 · 9c99c76 · 9c99c76
2 parents 5218747 + 8d54a46
commit 9c99c76
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 target
 
 # Eclipse
+.factorypath
 .settings
 *.classpath
 *.project

diff --git a/pom.xml b/pom.xml
@@ -35,12 +35,6 @@
       <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
@@ -53,33 +47,21 @@
       <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model-builder</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>file-management</artifactId>
-      <version>3.0.0</version>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.6.4</version>
+      <version>3.9.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git 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<String> 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
@@ -52,7 +52,7 @@ public abstract class AbstractGroovySourcesMojo extends AbstractGroovyMojo {
      */
     protected SortedSet<File> getFiles(final FileSet[] fromSources, final boolean includeJavaSources) {
         SortedSet<File> 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<File> getFiles(final FileSet[] fromSources, final boolean in
      */
     protected SortedSet<File> getTestFiles(final FileSet[] fromSources, final boolean includeJavaSources) {
         SortedSet<File> 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
@@ -42,7 +42,7 @@ public abstract class AbstractGroovyStubSourcesMojo extends AbstractGroovySource
      */
     protected Set<File> getStubs(File outputDirectory) {
         Set<File> files = new HashSet<>();
-        FileSetManager fileSetManager = new FileSetManager(getLog());
+        FileSetManager fileSetManager = new FileSetManager();
 
         FileSet fileSet = new FileSet();
         fileSet.setDirectory(outputDirectory.getAbsolutePath());