From: Michael Vorburger <vorburger@redhat.com>
Date: Thu, 5 Jul 2018 15:34:42 +0000 (+0200)
Subject: Revert "bump EclipseLink Moxy JAXB implementation from 2.6.2 to 2.7.1"
X-Git-Tag: release/fluorine~9
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c40f2c983456bdf4f5b1373f3ecb5c254edefa50;p=neutron.git

Revert "bump EclipseLink Moxy JAXB implementation from 2.6.2 to 2.7.1"

This reverts commit d40a0ef257d79fc3a3b21dede57da65ca36e0ab4.

because just a few months after I38f0285643ca0a1aea99a5e7f9e2b158bb86168c
we finally have an odlparent (3.1.2) which includes that and which neutron
meanwhile bumped to; we therefore don't need to override the version here anymore.

Issue: NEUTRON-160
Change-Id: I04e9b69389dd33c785a5165eb3e72016b76b56cc
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---

diff --git a/features/production/odl-neutron-northbound-api/pom.xml b/features/production/odl-neutron-northbound-api/pom.xml
index 56ff4e631..46501ecb5 100644
--- a/features/production/odl-neutron-northbound-api/pom.xml
+++ b/features/production/odl-neutron-northbound-api/pom.xml
@@ -53,7 +53,6 @@
             <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. -->
@@ -62,22 +61,5 @@
             <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 d7f1f4559..74683753d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -51,30 +51,6 @@
         <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>