From: Lorand Jakab <lojakab@cisco.com>
Date: Mon, 14 Jan 2019 09:38:15 +0000 (+0100)
Subject: Java 11 compatibility
X-Git-Tag: release/neon~3
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0a54fa4da470a286abf56237d8ee637a3638c2bf;p=lispflowmapping.git

Java 11 compatibility

Change-Id: I8f80353845d2c08efc97a78b8cbc57f714a29bd4
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---

diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
index f59721e22..c50e9fdb4 100644
--- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
@@ -25,6 +25,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.sun.activation</groupId>
+      <artifactId>javax.activation</artifactId>
+      <version>1.2.0</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-lispflowmapping-mappingservice</artifactId>
diff --git a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java
index 2ee0a2d95..6baf180fd 100644
--- a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java
+++ b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java
@@ -56,6 +56,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifierBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.modules.junit4.PowerMockRunnerDelegate;
@@ -64,6 +65,7 @@ import org.slf4j.LoggerFactory;
 
 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(MockitoJUnitRunner.class)
+@PowerMockIgnore({"javax.xml.datatype.*"}) // for Java 9+ compatibility, see https://github.com/powermock/powermock/issues/864
 @PrepareForTest({LoggerFactory.class})
 public class DataStoreBackEndTest {