SRADA-374: Changed Powermock and Mockito libraries to newer versions.

powermock-mockito-1.6.3 which was added in earlier commit to
org.tizen.dynamicanalyzer depends on mockito versions 1.10.8-1.10.X.

Also, updated mockito and powermock in org.tizen.dynamicanalyzer.common to
keep consistency.

Change-Id: I143a22c124f39e28e21bb72cc5f315975a1331b0

diff --git a/org.tizen.dynamicanalyzer.common/.classpath b/org.tizen.dynamicanalyzer.common/.classpath
index a09c61c..c87390e 100644 (file)
--- a/org.tizen.dynamicanalyzer.common/.classpath
+++ b/org.tizen.dynamicanalyzer.common/.classpath
@@ -5,8 +5,8 @@
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="test/src"/>
        <classpathentry kind="lib" path="test/lib/junit-4.10.jar"/>
-       <classpathentry kind="lib" path="test/lib/mockito-all-1.9.5.jar"/>
-       <classpathentry kind="lib" path="test/lib/powermock-mockito-1.5-full.jar"/>
        <classpathentry kind="lib" path="test/lib/javassist-3.16.1-GA.jar"/>
+       <classpathentry kind="lib" path="test/lib/mockito-all-1.10.19.jar"/>
+       <classpathentry kind="lib" path="test/lib/powermock-mockito-1.6.3-full.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/org.tizen.dynamicanalyzer.common/test/lib/mockito-all-1.10.19.jar b/org.tizen.dynamicanalyzer.common/test/lib/mockito-all-1.10.19.jar
new file mode 100644 (file)
index 0000000..c831489
Binary files /dev/null and b/org.tizen.dynamicanalyzer.common/test/lib/mockito-all-1.10.19.jar differ

diff --git a/org.tizen.dynamicanalyzer.common/test/lib/mockito-all-1.9.5.jar b/org.tizen.dynamicanalyzer.common/test/lib/mockito-all-1.9.5.jar
deleted file mode 100644 (file)
index 00416eb..0000000
Binary files a/org.tizen.dynamicanalyzer.common/test/lib/mockito-all-1.9.5.jar and /dev/null differ

diff --git a/org.tizen.dynamicanalyzer.common/test/lib/powermock-mockito-1.5-full.jar b/org.tizen.dynamicanalyzer.common/test/lib/powermock-mockito-1.5-full.jar
deleted file mode 100644 (file)
index fb8b2c2..0000000
Binary files a/org.tizen.dynamicanalyzer.common/test/lib/powermock-mockito-1.5-full.jar and /dev/null differ

diff --git a/org.tizen.dynamicanalyzer.common/test/lib/powermock-mockito-1.6.3-full.jar b/org.tizen.dynamicanalyzer.common/test/lib/powermock-mockito-1.6.3-full.jar
new file mode 100644 (file)
index 0000000..25bddf0
Binary files /dev/null and b/org.tizen.dynamicanalyzer.common/test/lib/powermock-mockito-1.6.3-full.jar differ

diff --git a/org.tizen.dynamicanalyzer/.classpath b/org.tizen.dynamicanalyzer/.classpath
index 096a2bd..4fd14c1 100644 (file)
--- a/org.tizen.dynamicanalyzer/.classpath
+++ b/org.tizen.dynamicanalyzer/.classpath
@@ -14,5 +14,8 @@
        <classpathentry kind="lib" path="test/lib/junit-4.10.jar"/>
        <classpathentry kind="lib" path="lib/org.eclipse.cdt.debug.edc_1.0.0.201503041838.jar"/>
        <classpathentry kind="lib" path="lib/org.eclipse.draw2d_3.7.2.v20111017-2020.jar"/>
+       <classpathentry kind="lib" path="test/lib/hamcrest-core-1.3.jar"/>
+       <classpathentry kind="lib" path="test/lib/powermock-mockito-1.6.3-full.jar"/>
+       <classpathentry kind="lib" path="test/lib/mockito-all-1.10.19.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/org.tizen.dynamicanalyzer/test/lib/mockito-all-1.10.19.jar b/org.tizen.dynamicanalyzer/test/lib/mockito-all-1.10.19.jar
new file mode 100644 (file)
index 0000000..c831489
Binary files /dev/null and b/org.tizen.dynamicanalyzer/test/lib/mockito-all-1.10.19.jar differ

diff --git a/org.tizen.dynamicanalyzer/test/lib/mockito-all-1.9.5.jar b/org.tizen.dynamicanalyzer/test/lib/mockito-all-1.9.5.jar
deleted file mode 100644 (file)
index 00416eb..0000000
Binary files a/org.tizen.dynamicanalyzer/test/lib/mockito-all-1.9.5.jar and /dev/null differ

diff --git a/org.tizen.dynamicanalyzer/test/lib/powermock-mockito-1.5-full.jar b/org.tizen.dynamicanalyzer/test/lib/powermock-mockito-1.5-full.jar
deleted file mode 100644 (file)
index fb8b2c2..0000000
Binary files a/org.tizen.dynamicanalyzer/test/lib/powermock-mockito-1.5-full.jar and /dev/null differ