Fix compilation with JDK11

PowerMock-1.7.4 just does not work with JDK11, update it to version
2.0.0.RC-4, which mostly works, and add javax.xml exclusions to
work around the remaining issue.

Change-Id: I947bd4f721a0cfaad5e0bc02ec5f87665eb0bddd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index d1f5fb7af21dbcc99f6445aa058c983e134864c8..a4a6733ecfc67da854fcf37b8149890cfd435951 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -50,37 +50,28 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>2.8.9</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-core</artifactId>
+      <version>2.0.0-RC.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.21.0-GA</version>
+      <version>2.0.0-RC.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
-      <version>1.7.4</version>
+      <version>2.0.0-RC.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-support</artifactId>
+      <version>2.0.0-RC.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/AaaCertProviderTest.java b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/AaaCertProviderTest.java
index e28360331de7e8acc7fc027233dff72113d8bb27..b0513be46677e53944dfe2d4e472940fa1b5a259 100644 (file)
--- a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/AaaCertProviderTest.java
+++ b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/AaaCertProviderTest.java
@@ -22,9 +22,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.aaa
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.aaa.cert.service.config.CtlKeystoreBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.aaa.cert.service.config.TrustKeystore;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.aaa.cert.service.config.TrustKeystoreBuilder;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
+@PowerMockIgnore("javax.xml.*")
 public class AaaCertProviderTest {
 
     private static AaaCertProvider aaaCertProv;

diff --git a/aaa-encrypt-service/impl/pom.xml b/aaa-encrypt-service/impl/pom.xml
index 9d969bff4d21fcad6e6530e5a51e9197f2c9d842..3564cc571027ffda4f0aa2d8da6ef99a7a27ac34 100644 (file)
--- a/aaa-encrypt-service/impl/pom.xml
+++ b/aaa-encrypt-service/impl/pom.xml
@@ -60,37 +60,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>2.8.9</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.21.0-GA</version>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Powermock and workarounds -->
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-core</artifactId>
+      <version>2.0.0-RC.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
+      <version>2.0.0-RC.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
-      <version>1.7.4</version>
+      <version>2.0.0-RC.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-support</artifactId>
+      <version>2.0.0-RC.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/aaa-encrypt-service/impl/src/test/java/org/opendaylight/aaa/encrypt/impl/AAAEncryptServiceImplTest.java b/aaa-encrypt-service/impl/src/test/java/org/opendaylight/aaa/encrypt/impl/AAAEncryptServiceImplTest.java
index fd8fa87753a5104d955eef054c6f2f81a85ac1ea..07252c35d31d8800bdf1bbfe2788f6c09a4af8f2 100644 (file)
--- a/aaa-encrypt-service/impl/src/test/java/org/opendaylight/aaa/encrypt/impl/AAAEncryptServiceImplTest.java
+++ b/aaa-encrypt-service/impl/src/test/java/org/opendaylight/aaa/encrypt/impl/AAAEncryptServiceImplTest.java
@@ -27,7 +27,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
  */
 
 @RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.crypto.*")
+@PowerMockIgnore({ "javax.crypto.*", "javax.xml.*" })
 @PrepareForTest(MdsalUtils.class)
 public class AAAEncryptServiceImplTest {