From d012ea1c2f1e1ae8526a3a0ae3204363f83e5e8a Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Wed, 27 Jan 2016 22:13:40 +0100
Subject: [PATCH] BUG-2625: fix failures with Java 8-targetted artifacts

This patch bumps to use equinox 3.9.1 and removes the use of
mockito-all, fixing failures seen with source/target set to Java 8

Change-Id: I6964633e2c6b0de934045522c8f245fdb66901da
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 opendaylight/md-sal/sal-binding-it/pom.xml                   | 2 +-
 .../controller/test/sal/binding/it/TestHelper.java           | 4 +++-
 .../md-sal/samples/clustering-test-app/provider/pom.xml      | 5 ++---
 opendaylight/md-sal/samples/toaster-it/pom.xml               | 5 -----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml
index 8d8f6652c2..7b6c27e288 100644
--- a/opendaylight/md-sal/sal-binding-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-it/pom.xml
@@ -18,7 +18,7 @@
       <artifactId>logback-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>equinoxSDK381</groupId>
+      <groupId>org.eclipse.tycho</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
index 9d651cdf85..8c069510a3 100644
--- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
+++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
@@ -172,7 +172,9 @@ public class TestHelper {
         return new DefaultCompositeOption(
         // Repository required to load harmcrest (OSGi-fied version).
         // Mockito
-                mavenBundle("org.mockito", "mockito-all", "1.9.5"), junitBundles(),
+                mavenBundle("org.mockito", "mockito-core", "1.10.19"),
+                mavenBundle("org.objenesis", "objenesis", "2.2"),
+                junitBundles(),
 
                 /*
                  * Felix has implicit boot delegation enabled by default. It
diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
index 97bc1d0156..c14482f6cc 100644
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
@@ -99,9 +99,8 @@
             <version>${mdsal.version}</version>
         </dependency>
         <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.eclipse.osgi</artifactId>
-          <version>3.8.1.v20120830-144521</version>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml
index fa6b9aa083..4acb6636ee 100644
--- a/opendaylight/md-sal/samples/toaster-it/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-it/pom.xml
@@ -47,11 +47,6 @@
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit4</artifactId>
     </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-native</artifactId>
-- 
2.36.6