From 9b1ef89ec05e2c4fe55870132a897d05dac40829 Mon Sep 17 00:00:00 2001
From: Paul Thomson <paulthomson@users.noreply.github.com>
Date: Thu, 27 Sep 2018 16:46:12 +0100
Subject: [PATCH] Fix unused or undeclared dependencies (#20)

* Minor fix to dependencies.

* Fix more dependency issues.

* Another dependency tweak.
---
 ast/pom.xml               |  1 +
 client-tests/pom.xml      | 22 ++++++++++++++++++++++
 generator/pom.xml         | 21 ++-------------------
 parent-all/pom.xml        |  3 ---
 parent-checkstyle/pom.xml |  5 -----
 reducer/pom.xml           | 20 +-------------------
 server-public/pom.xml     |  2 ++
 server/pom.xml            |  2 ++
 shadersets-util/pom.xml   |  3 +++
 tester/pom.xml            | 10 +++++++++-
 10 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/ast/pom.xml b/ast/pom.xml
index 6ce10fec7..c87e504eb 100644
--- a/ast/pom.xml
+++ b/ast/pom.xml
@@ -39,6 +39,7 @@ limitations under the License.
     <dependency>
       <groupId>com.graphicsfuzz</groupId>
       <artifactId>util</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/client-tests/pom.xml b/client-tests/pom.xml
index e673cacb8..e7855dc03 100755
--- a/client-tests/pom.xml
+++ b/client-tests/pom.xml
@@ -64,6 +64,28 @@ limitations under the License.
       <groupId>net.sourceforge.argparse4j</groupId>
       <artifactId>argparse4j</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.bytedeco.javacpp-presets</groupId>
+      <artifactId>opencv</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.bytedeco.javacpp-presets</groupId>
+      <artifactId>opencv</artifactId>
+      <classifier>linux-x86_64</classifier>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bytedeco.javacpp-presets</groupId>
+      <artifactId>opencv</artifactId>
+      <classifier>macosx-x86_64</classifier>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bytedeco.javacpp-presets</groupId>
+      <artifactId>opencv</artifactId>
+      <classifier>windows-x86_64</classifier>
+      <scope>runtime</scope>
+    </dependency>
 
   </dependencies>
 
diff --git a/generator/pom.xml b/generator/pom.xml
index a3d189bf0..dd2c22cfa 100644
--- a/generator/pom.xml
+++ b/generator/pom.xml
@@ -57,25 +57,6 @@ limitations under the License.
       <groupId>net.sourceforge.argparse4j</groupId>
       <artifactId>argparse4j</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.bytedeco.javacpp-presets</groupId>
-      <artifactId>opencv</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.bytedeco.javacpp-presets</groupId>
-      <artifactId>opencv</artifactId>
-      <classifier>linux-x86_64</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.bytedeco.javacpp-presets</groupId>
-      <artifactId>opencv</artifactId>
-      <classifier>macosx-x86_64</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.bytedeco.javacpp-presets</groupId>
-      <artifactId>opencv</artifactId>
-      <classifier>windows-x86_64</classifier>
-    </dependency>
     <dependency>
       <groupId>com.graphicsfuzz</groupId>
       <artifactId>ast</artifactId>
@@ -83,10 +64,12 @@ limitations under the License.
     <dependency>
       <groupId>com.graphicsfuzz</groupId>
       <artifactId>util</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/parent-all/pom.xml b/parent-all/pom.xml
index c6632f3a4..0cccd4c3d 100644
--- a/parent-all/pom.xml
+++ b/parent-all/pom.xml
@@ -61,7 +61,6 @@ limitations under the License.
         <artifactId>thrift-compiler-binary</artifactId>
         <version>6e3ee39</version>
         <type>zip</type>
-        <scope>provided</scope>
       </dependency>
 
 
@@ -87,7 +86,6 @@ limitations under the License.
             <artifactId>ant</artifactId>
           </exclusion>
         </exclusions>
-        <scope>provided</scope>
       </dependency>
 
       <dependency>
@@ -387,7 +385,6 @@ limitations under the License.
         <classifier>shaders</classifier>
         <version>1.0</version>
         <type>zip</type>
-        <scope>provided</scope>
       </dependency>
 
       <dependency>
diff --git a/parent-checkstyle/pom.xml b/parent-checkstyle/pom.xml
index 3984b9324..7b8a165c2 100644
--- a/parent-checkstyle/pom.xml
+++ b/parent-checkstyle/pom.xml
@@ -71,11 +71,6 @@ limitations under the License.
             <configuration>
               <failOnWarning>true</failOnWarning>
               <ignoreNonCompile>true</ignoreNonCompile>
-              <ignoredDependencies>
-                <ignoredDependency>org.bytedeco.javacpp-presets:opencv</ignoredDependency>
-                <ignoredDependency>org.apache.logging.log4j:log4j-core</ignoredDependency>
-                <ignoredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredDependency>
-              </ignoredDependencies>
             </configuration>
           </execution>
         </executions>
diff --git a/reducer/pom.xml b/reducer/pom.xml
index 5aa8f0cc4..7ba9b789d 100644
--- a/reducer/pom.xml
+++ b/reducer/pom.xml
@@ -91,25 +91,7 @@ limitations under the License.
       <groupId>net.sourceforge.argparse4j</groupId>
       <artifactId>argparse4j</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.bytedeco.javacpp-presets</groupId>
-      <artifactId>opencv</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.bytedeco.javacpp-presets</groupId>
-      <artifactId>opencv</artifactId>
-      <classifier>linux-x86_64</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.bytedeco.javacpp-presets</groupId>
-      <artifactId>opencv</artifactId>
-      <classifier>macosx-x86_64</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.bytedeco.javacpp-presets</groupId>
-      <artifactId>opencv</artifactId>
-      <classifier>windows-x86_64</classifier>
-    </dependency>
+
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
diff --git a/server-public/pom.xml b/server-public/pom.xml
index d9d0206f9..f2962a49b 100644
--- a/server-public/pom.xml
+++ b/server-public/pom.xml
@@ -111,10 +111,12 @@ limitations under the License.
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.graphicsfuzz</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index 875fd3ac5..77f98682c 100755
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -99,10 +99,12 @@ limitations under the License.
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.graphicsfuzz</groupId>
diff --git a/shadersets-util/pom.xml b/shadersets-util/pom.xml
index f0adb53ba..e8a79bcb5 100644
--- a/shadersets-util/pom.xml
+++ b/shadersets-util/pom.xml
@@ -60,16 +60,19 @@ limitations under the License.
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>opencv</artifactId>
       <classifier>linux-x86_64</classifier>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>opencv</artifactId>
       <classifier>macosx-x86_64</classifier>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>opencv</artifactId>
       <classifier>windows-x86_64</classifier>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
diff --git a/tester/pom.xml b/tester/pom.xml
index 48abd0a53..fda86bb5a 100644
--- a/tester/pom.xml
+++ b/tester/pom.xml
@@ -54,6 +54,7 @@ limitations under the License.
     <dependency>
       <groupId>com.graphicsfuzz</groupId>
       <artifactId>server-thrift-gen</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.graphicsfuzz</groupId>
@@ -70,39 +71,46 @@ limitations under the License.
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>javacpp</artifactId>
+      <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>opencv</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>opencv</artifactId>
       <classifier>linux-x86_64</classifier>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>opencv</artifactId>
       <classifier>macosx-x86_64</classifier>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>opencv</artifactId>
       <classifier>windows-x86_64</classifier>
+      <scope>test</scope>
     </dependency>