Fix for moxy load order and missing dependency.

Change-Id: If427b067d79e1efe705429916ae3b6aa9e0d9170
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index 9b78d8f7aca4fb753f3ccae88d6895e85e959514..ddf08de20d08040ad5a8eca4dfd1d9670e07f99f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -47,6 +47,10 @@
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.antlr</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index b6fcbaa382b017c31c3b5e60c85fc0f218f0308c..e54a8068d41e81e9075512e980682c1b39be55fc 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -13,13 +13,13 @@
     <feature version='${aaa.version}'>odl-aaa-authn</feature>
     <feature>war</feature>
     <feature version='${project.version}'>odl-neutron-spi</feature>
-    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/${eclipse.persistence.version}</bundle>
-    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.core/${eclipse.persistence.version}</bundle>
-    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/${eclipse.persistence.version}</bundle>
     <bundle>mvn:org.opendaylight.neutron/northbound-api/${project.version}</bundle>
     <bundle>mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle>
     <bundle>mvn:com.sun.jersey/jersey-server/${jersey.version}</bundle>
     <bundle>mvn:com.sun.jersey/jersey-servlet/${jersey.version}</bundle>
+    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/${eclipse.persistence.version}</bundle>
+    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.core/${eclipse.persistence.version}</bundle>
+    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/${eclipse.persistence.version}</bundle>
     <bundle>mvn:org.osgi/org.osgi.core/${osgi.core.version}</bundle>
   </feature>