Restore duplicate check

With the recent odlparent and yangtools bumps in Neon, the
handling of jaxb-api and activation changed; for features, this is
dealt with by excluding the relevant artifacts from generated
features, but other tests end up with duplicates since the artifacts
include classes which are also present in the JVM’s rt.jar.

This patch excludes jaxb-api and activation, and restores the
duplicate check.

JIRA: INFRAUTILS-59
Change-Id: Ifa8f0fd86c8b65655cc50261f198d3deb2411499
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit 4cfb487ceacbe9a21b845f98d4f01b59e0e94926)

diff --git a/integration/test-standalone/pom.xml b/integration/test-standalone/pom.xml
index 9dda764072d306b87cf33b74b817e9a99dbc8455..2be5ad8fbc7e162cee5db0e31cb03ad24774af64 100644 (file)
--- a/integration/test-standalone/pom.xml
+++ b/integration/test-standalone/pom.xml
@@ -53,6 +53,16 @@
       <artifactId>sal-binding-broker-impl</artifactId>
       <version>1.9.0-SNAPSHOT</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/integration/test-standalone/src/test/java/org/opendaylight/neutron/e2etest/NeutronE2ETest.java b/integration/test-standalone/src/test/java/org/opendaylight/neutron/e2etest/NeutronE2ETest.java
index 82bcb882965578967779492ae52b0ec9d029bc8f..ffa112c5ee640d0b5ccc047808e9f28b6d302052 100644 (file)
--- a/integration/test-standalone/src/test/java/org/opendaylight/neutron/e2etest/NeutronE2ETest.java
+++ b/integration/test-standalone/src/test/java/org/opendaylight/neutron/e2etest/NeutronE2ETest.java
@@ -10,7 +10,6 @@ package org.opendaylight.neutron.e2etest;
 import java.io.IOException;
 import javax.inject.Inject;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.opendaylight.aaa.web.WebServer;
@@ -25,7 +24,6 @@ import org.opendaylight.infrautils.testutils.ClasspathHellDuplicatesCheckRule;
  *
  * @author Michael Vorburger.ch
  */
-@Ignore // TODO NEUTRON-197: remove this again post Neon-MRI, see c/76239
 public class NeutronE2ETest {
 
     public static @ClassRule ClasspathHellDuplicatesCheckRule jHades = new ClasspathHellDuplicatesCheckRule();