Merge pull request #308 from TheSnoozer/master

fixes for oraclejdk9

Author: TheSnoozer

.travis.yml

@@ -1,5 +1,7 @@
 language: java
 sudo: false
+dist: trusty
 jdk:
+  - oraclejdk9
   - oraclejdk8
   - openjdk7

pom.xml

@@ -59,7 +59,7 @@
 
     <jgit.version>4.5.2.201704071617-r</jgit.version>
     <junit.version>4.12</junit.version>
-    <mockito.version>2.0.35-beta</mockito.version>
+    <mockito.version>2.8.47</mockito.version>
 
     <fest-assert.version>1.4</fest-assert.version>
   </properties>
@@ -234,7 +234,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-plugin-plugin</artifactId>
@@ -293,6 +293,11 @@
 -->
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 

src/test/java/org/mockito/internal/util/reflection/Whitebox.java

@@ -0,0 +1,40 @@
+package org.mockito.internal.util.reflection;
+
+import java.lang.reflect.Field;
+
+@Deprecated
+public class Whitebox {
+    public static void setInternalState(Object target, String field, Object value) {
+        Class<?> c = target.getClass();
+        try {
+            Field f = getFieldFromHierarchy(c, field);
+            f.setAccessible(true);
+            f.set(target, value);
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to set internal state on a private field. Please report to mockito mailing list.", e);
+        }
+    }
+
+    private static Field getFieldFromHierarchy(Class<?> clazz, String field) {
+        Field f = getField(clazz, field);
+        while (f == null && clazz != Object.class) {
+            clazz = clazz.getSuperclass();
+            f = getField(clazz, field);
+        }
+        if (f == null) {
+            throw new RuntimeException(
+                    "You want me to get this field: '" + field +
+                    "' on this class: '" + clazz.getSimpleName() + 
+                    "' but this field is not declared withing hierarchy of this class!");
+        }
+        return f;
+    }
+
+    private static Field getField(Class<?> clazz, String field) {
+        try {
+            return clazz.getDeclaredField(field);
+        } catch (NoSuchFieldException e) {
+            return null;
+        }
+    }
+}