Set Lombok scope to provided (#5785)

* Set Lombok scope to provided * Update gym-java-client to use version properties and use updated mockito 2 api
deeplearning4j · Jul 3, 2018 · ac0ce25 · ac0ce25
1 parent 4f8c525
commit ac0ce25
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/pom.xml b/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/pom.xml
@@ -32,6 +32,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.nd4j</groupId>

diff --git a/...ng4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-model/pom.xml b/...ng4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-model/pom.xml
@@ -22,6 +22,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.nd4j</groupId>

diff --git a/gym-java-client/pom.xml b/gym-java-client/pom.xml
@@ -50,44 +50,50 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>2.0.2-beta</version>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib</artifactId>
+            <version>3.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.5</version>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>1.7.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.5</version>
+            <version>1.7.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.3</version>
+            <version>${logback.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>1.1.3</version>
+            <version>${logback.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.16</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/gym-java-client/src/test/java/org/deeplearning4j/gym/test/JSONObjectMatcher.java b/gym-java-client/src/test/java/org/deeplearning4j/gym/test/JSONObjectMatcher.java
@@ -1,6 +1,5 @@
 package org.deeplearning4j.gym.test;
 
-import org.hamcrest.Description;
 import org.json.JSONObject;
 import org.mockito.ArgumentMatcher;
 
@@ -11,7 +10,7 @@
  */
 
 
-public class JSONObjectMatcher extends ArgumentMatcher<JSONObject> {
+public class JSONObjectMatcher implements ArgumentMatcher<JSONObject> {
     private final JSONObject expected;
 
     public JSONObjectMatcher(JSONObject expected) {
@@ -22,18 +21,10 @@ public static JSONObject jsonEq(JSONObject expected) {
         return argThat(new JSONObjectMatcher(expected));
     }
 
+
     @Override
-    public boolean matches(Object argument) {
+    public boolean matches(JSONObject argument) {
         if (expected == null)
             return argument == null;
-        if (!(argument instanceof JSONObject))
-            return false;
-        JSONObject actual = (JSONObject) argument;
-        return expected.toString().equals(actual.toString());
-    }
-
-    @Override
-    public void describeTo(Description description) {
-        description.appendText(expected.toString());
-    }
+        return expected.toString().equals(argument.toString());    }
 }