Merge branch 'master' into RAT-324_tests_to_validate_that_UI_options

apache · May 17, 2024 · 823509b · 823509b
2 parents c92cb15 + 3d1ba41
commit 823509b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@
 /target/
 **/.gitignore
 **/lib/
+**/bin
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
@@ -19,6 +19,10 @@
 
 package org.apache.rat.walker;
 
+<<<<<<< RAT-324_tests_to_validate_that_UI_options
+=======
+import java.io.FilenameFilter;
+>>>>>>> master
 import java.nio.file.Path;
 import java.util.SortedSet;
 

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
@@ -157,7 +157,6 @@
     <dependency>
       <groupId>org.apache.rat</groupId>
       <artifactId>apache-rat-core</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.rat</groupId>
@@ -185,7 +184,6 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>${mavenPluginPluginVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>