From 5f3ff0aed85d0c14a68f8f6052b0d1df82e2fd49 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 22 May 2020 11:36:49 +0200
Subject: [PATCH] Remove hamcrest dependency, where it is not needed directly.
 Use scope compile for hamcrest in pmd-lang-test

---
 pmd-cpp/pom.xml         | 6 +-----
 pmd-cs/pom.xml          | 6 +-----
 pmd-dart/pom.xml        | 6 +-----
 pmd-dist/pom.xml        | 2 +-
 pmd-doc/pom.xml         | 1 +
 pmd-fortran/pom.xml     | 6 +-----
 pmd-groovy/pom.xml      | 6 +-----
 pmd-java8/pom.xml       | 2 +-
 pmd-javascript/pom.xml  | 6 +-----
 pmd-jsp/pom.xml         | 6 +-----
 pmd-kotlin/pom.xml      | 6 +-----
 pmd-lang-test/pom.xml   | 2 +-
 pmd-lua/pom.xml         | 6 +-----
 pmd-matlab/pom.xml      | 6 +-----
 pmd-modelica/pom.xml    | 1 +
 pmd-objectivec/pom.xml  | 5 -----
 pmd-php/pom.xml         | 5 -----
 pmd-plsql/pom.xml       | 5 -----
 pmd-python/pom.xml      | 5 -----
 pmd-ruby/pom.xml        | 5 -----
 pmd-scala/pom.xml       | 6 ------
 pmd-swift/pom.xml       | 5 -----
 pmd-test/pom.xml        | 6 +++++-
 pmd-visualforce/pom.xml | 5 -----
 pmd-vm/pom.xml          | 5 -----
 pmd-xml/pom.xml         | 5 -----
 pom.xml                 | 4 ----
 27 files changed, 20 insertions(+), 109 deletions(-)

diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index 2d919de18c..dd1b02f925 100644
--- a/pmd-cpp/pom.xml
+++ b/pmd-cpp/pom.xml
@@ -73,11 +73,7 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index d9a492434a..59b3f8c512 100644
--- a/pmd-cs/pom.xml
+++ b/pmd-cs/pom.xml
@@ -38,11 +38,7 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index 2905e146be..1fb057f280 100644
--- a/pmd-dart/pom.xml
+++ b/pmd-dart/pom.xml
@@ -42,11 +42,7 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 6e364eb5f1..4c2a5b554e 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -223,11 +223,11 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml
index 16343a5a26..f812c686ea 100644
--- a/pmd-doc/pom.xml
+++ b/pmd-doc/pom.xml
@@ -101,6 +101,7 @@
             <artifactId>snakeyaml</artifactId>
             <version>1.19</version>
         </dependency>
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index 08478b2d2a..9dc9869f39 100644
--- a/pmd-fortran/pom.xml
+++ b/pmd-fortran/pom.xml
@@ -32,11 +32,7 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index 20e943d819..d2e3ccb940 100644
--- a/pmd-groovy/pom.xml
+++ b/pmd-groovy/pom.xml
@@ -38,11 +38,7 @@
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml
index 52424c9713..474954cb10 100644
--- a/pmd-java8/pom.xml
+++ b/pmd-java8/pom.xml
@@ -50,11 +50,11 @@
             <artifactId>pmd-java</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index 2c5d11f600..bef3ce7218 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -86,11 +86,7 @@
             <groupId>net.sourceforge.saxon</groupId>
             <artifactId>saxon</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index 5565aa7e5e..3a40a578f8 100644
--- a/pmd-jsp/pom.xml
+++ b/pmd-jsp/pom.xml
@@ -87,11 +87,7 @@
             <groupId>net.sourceforge.saxon</groupId>
             <artifactId>saxon</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
index 5191e86c74..63e6494a85 100644
--- a/pmd-kotlin/pom.xml
+++ b/pmd-kotlin/pom.xml
@@ -42,11 +42,7 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index adb482e443..debfe43d8a 100644
--- a/pmd-lang-test/pom.xml
+++ b/pmd-lang-test/pom.xml
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index 793393ccfd..9adc2892b8 100644
--- a/pmd-lua/pom.xml
+++ b/pmd-lua/pom.xml
@@ -42,11 +42,7 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index 1d39d61bdb..f44706c9c6 100644
--- a/pmd-matlab/pom.xml
+++ b/pmd-matlab/pom.xml
@@ -73,11 +73,7 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml
index c1e4f6d4c7..f28ff3804b 100644
--- a/pmd-modelica/pom.xml
+++ b/pmd-modelica/pom.xml
@@ -76,6 +76,7 @@
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index c0bdb20831..e282919fbb 100644
--- a/pmd-objectivec/pom.xml
+++ b/pmd-objectivec/pom.xml
@@ -74,11 +74,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 2167349296..656dc71642 100644
--- a/pmd-php/pom.xml
+++ b/pmd-php/pom.xml
@@ -29,11 +29,6 @@
             <artifactId>pmd-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index d65477bbb0..2a3271589c 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -96,11 +96,6 @@
             <artifactId>saxon</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 6bd1b7eb67..a0449eff2f 100644
--- a/pmd-python/pom.xml
+++ b/pmd-python/pom.xml
@@ -74,11 +74,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index 6556c0451f..9521f1a222 100644
--- a/pmd-ruby/pom.xml
+++ b/pmd-ruby/pom.xml
@@ -20,11 +20,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml
index a2810e43b7..04fc9c2eae 100644
--- a/pmd-scala/pom.xml
+++ b/pmd-scala/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>pmd-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -60,7 +55,6 @@
             <artifactId>junit-vintage-engine</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index a41a7cb257..aed7e3978e 100644
--- a/pmd-swift/pom.xml
+++ b/pmd-swift/pom.xml
@@ -43,11 +43,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index b0f6b7b7b7..aae1645336 100644
--- a/pmd-test/pom.xml
+++ b/pmd-test/pom.xml
@@ -12,6 +12,11 @@
     </parent>
 
     <dependencies>
+         <!--
+             hamcrest and junit are scope compile,
+             so that they are automatically available to users
+             of the pmd-test module
+        -->
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
@@ -20,7 +25,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <!-- overrides the default scope from inherited dependency management. -->
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 8a80c7daad..6e9b1ce5d2 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -88,11 +88,6 @@
             <artifactId>saxon</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index b5c87265e8..7af1dd4fa7 100644
--- a/pmd-vm/pom.xml
+++ b/pmd-vm/pom.xml
@@ -96,11 +96,6 @@
             <artifactId>saxon</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index 4c8d3889b1..f10e9bc259 100644
--- a/pmd-xml/pom.xml
+++ b/pmd-xml/pom.xml
@@ -50,11 +50,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/pom.xml b/pom.xml
index 18bf565575..e38c6347b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -710,10 +710,6 @@
                         <groupId>org.hamcrest</groupId>
                         <artifactId>hamcrest-core</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>org.hamcrest</groupId>
-                        <artifactId>hamcrest-library</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>