Fix unused or undeclared dependencies (#20)

* Minor fix to dependencies. * Fix more dependency issues. * Another dependency tweak.
google · Sep 27, 2018 · 9b1ef89 · 9b1ef89
1 parent 47f99e8
commit 9b1ef89
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 47 deletions.
diff --git 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
@@ -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
@@ -57,36 +57,19 @@ 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>
     </dependency>
     <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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>