Merge "comment out integration/test ITNeutronE2E"

diff --git a/features/production/odl-neutron-northbound-api/pom.xml b/features/production/odl-neutron-northbound-api/pom.xml
index a38afed2fbeb55083c0f35c993a28914b4f69c2b..ad6dfd84f8db21e5e4f27c9686f5f5c2da16745d 100644 (file)
--- a/features/production/odl-neutron-northbound-api/pom.xml
+++ b/features/production/odl-neutron-northbound-api/pom.xml
@@ -46,6 +46,7 @@
             <artifactId>northbound-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <!-- because the REST API classes @Inject @OsgiService INeutronCRUD dependencies,
              we do need a dependency to the implementation of those INeutronCRUDs in transcriber;
              otherwise this feature would not work standalone, and SFT will fail. -->
@@ -54,5 +55,22 @@
             <artifactId>transcriber</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- See, and keep this in sync with, project-neutron-parent -->
+        <dependency>
+          <groupId>org.eclipse.persistence</groupId>
+          <artifactId>org.eclipse.persistence.antlr</artifactId>
+          <version>2.7.1</version>
+        </dependency>
+        <dependency>
+          <groupId>org.eclipse.persistence</groupId>
+          <artifactId>org.eclipse.persistence.core</artifactId>
+          <version>2.7.1</version>
+        </dependency>
+        <dependency>
+          <groupId>org.eclipse.persistence</groupId>
+          <artifactId>org.eclipse.persistence.moxy</artifactId>
+          <version>2.7.1</version>
+        </dependency>
      </dependencies>
 </project>

diff --git a/parent/pom.xml b/parent/pom.xml
index 2aaaa9d2109d6ac7b70f85f5da081c510928d9ec..e42c2331fa3b2445d9d55678e483034b8de5814c 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -44,6 +44,30 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
+      <!-- Bump EclipseLink Moxy JAXB implementation to a higher version than the one we get from odlparent
+           until https://git.opendaylight.org/gerrit/#/c/70716/ is merged, an odlparent with it is release and this project bumped to it;
+           TODO then remove this again.
+
+           This was done in the hope it may help with the weird spurious test failures seen in NEUTRON-159.
+
+           NB odl-neutron-northbound-api has identical version bumps, and must be kept in sync with this.
+       -->
+      <dependency>
+        <groupId>org.eclipse.persistence</groupId>
+        <artifactId>org.eclipse.persistence.antlr</artifactId>
+        <version>2.7.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.persistence</groupId>
+        <artifactId>org.eclipse.persistence.core</artifactId>
+        <version>2.7.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.persistence</groupId>
+        <artifactId>org.eclipse.persistence.moxy</artifactId>
+        <version>2.7.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>