Upgrade to Sodium SR4

Upgrade to OpenDaylight Sodium SR4
Also, install implementation class for JAX-WS, needed by aafshiro

Change-Id: I5d1433df3ef13a75323046024db23d17b30b340f
Issue-ID: CCSDK-2729
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index fb57c40..03e1533 100755 (executable)
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -6,7 +6,7 @@
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
@@ -48,12 +48,12 @@
             <artifactId>jackson-module-jsonSchema</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
         <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
         </dependency>
         <dependency>
             <groupId>javax</groupId>
@@ -134,6 +134,11 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxws-api-2.3</artifactId>
+            <version>2.3_1</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/opendaylight/sodium/pom.xml b/opendaylight/sodium/pom.xml
index 5a82bbb..f2b571f 100644 (file)
--- a/opendaylight/sodium/pom.xml
+++ b/opendaylight/sodium/pom.xml
@@ -18,7 +18,7 @@
     <properties>
                <ccsdk.project.version>${project.version}</ccsdk.project.version>
                <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-               <ccsdk.opendaylight.version>0.11.3</ccsdk.opendaylight.version>
+               <ccsdk.opendaylight.version>0.11.4</ccsdk.opendaylight.version>
                <docker.push.phase>deploy</docker.push.phase>
     </properties>