ODL Neon SR1 upgrade

change ccsdk image for Neon
SR1

Change-Id: I86c9374c1bdab0685769e42af6773189b92aaf80
Issue-ID: APPC-1749
Signed-off-by: Taka Cho <takamune.cho@att.com>

diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml
index 50508aa..789d594 100644 (file)
--- a/binding-parent/pom.xml
+++ b/binding-parent/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.4.3</version>
         <relativePath />
     </parent>
 
@@ -152,12 +152,53 @@ limitations under the License.
                 <artifactId>aai-service-provider</artifactId>
                 <version>${sdnctl.aai.service.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.javassist</groupId>
+               <artifactId>javassist</artifactId>
+               <version>3.21.0-GA</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.mockito</groupId>
+               <artifactId>mockito-core</artifactId>
+               <version>1.10.19</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.powermock</groupId>
+               <artifactId>powermock-module-junit4</artifactId>
+               <version>1.6.4</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.powermock</groupId>
+               <artifactId>powermock-api-support</artifactId>
+               <version>1.6.4</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.powermock</groupId>
+               <artifactId>powermock-reflect</artifactId>
+               <version>1.6.4</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.powermock</groupId>
+               <artifactId>powermock-core</artifactId>
+               <version>1.6.4</version>
+               <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index 195cc8c..e148641 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.4.3</version>
         <relativePath />
     </parent>
 

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index a2cad73..6c9c95a 100644 (file)
--- a/feature-repo-parent/pom.xml
+++ b/feature-repo-parent/pom.xml
@@ -31,13 +31,55 @@ limitations under the License.
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.4.3</version>
         <relativePath />
     </parent>
 
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.javassist</groupId>
+                <artifactId>javassist</artifactId>
+                <version>3.21.0-GA</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>1.10.19</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-support</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-reflect</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-core</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index 4eea75e..cdc1a84 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.5</version>
+        <version>1.4.3</version>
         <relativePath />
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 7c263ec..16c403f 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.5</version>
+        <version>1.4.3</version>
         <relativePath />
     </parent>
 

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index b4bad75..39694c9 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.4.3</version>
         <relativePath />
     </parent>
 
@@ -73,6 +73,48 @@ limitations under the License.
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.javassist</groupId>
+                <artifactId>javassist</artifactId>
+                <version>3.21.0-GA</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>1.10.19</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-support</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-reflect</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-core</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>