Move to release parent

Move to 1.5.2 parent

Issue-ID: OAM-67
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: Icd2b49ce0b15a06ba753080418db2d6e65edfeb4
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>

diff --git a/distribution/nonrtric-o1-controller-frankfurt/pom.xml b/distribution/nonrtric-o1-controller-frankfurt/pom.xml
index cdf07f1..df327ce 100644 (file)
--- a/distribution/nonrtric-o1-controller-frankfurt/pom.xml
+++ b/distribution/nonrtric-o1-controller-frankfurt/pom.xml
@@ -23,7 +23,8 @@
   </organization>
 
   <properties>
-    <base.image.repo>nexus3.onap.org:10001/onap/sdnc-image:1.8.0-STAGING-20200225T124813Z</base.image.repo>
+    <base.image.repo>hightec/sdnc-image-wt-patch:latest</base.image.repo>
+    <!--<base.image.repo>nexus3.onap.org:10001/onap/sdnc-image:1.8.0-STAGING-20200225T124813Z</base.image.repo>-->
     <image.name>o-ran-sc/${project.artifactId}</image.name>
     <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
     <o-ran-sc.project.version>${project.version}</o-ran-sc.project.version>

diff --git a/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile b/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
index 9482d2f..79bafef 100644 (file)
--- a/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
+++ b/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
@@ -1,7 +1,12 @@
 # Base odl alpine with added packages needed for
 FROM ${base.image.repo}
-ENV SDNR_ORAN_REPO ${features.repo}
-RUN sed -i -e "\|featuresRepositories|s|$|,${SDNR_ORAN_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+
+# Image info
+ENV IMAGEPATH ${IMAGEPATH}//${image.name}
+ENV IMAGENAMES ${IMAGENAMES}//"ORAN nonrtric"
+
+# Adjust repo und feature boot info for karaf
+RUN sed -i -e "\|featuresRepositories|s|$|,${features.repo}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 ENV SDNRWT_BOOTFEATURES ${features.boot}
 
 USER root

diff --git a/features/devicemanager/o-ran/ru-fh/feature/pom.xml b/features/devicemanager/o-ran/ru-fh/feature/pom.xml
index a6eb0c9..ea5fefd 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/feature/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/feature/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/devicemanager/o-ran/ru-fh/installer/pom.xml b/features/devicemanager/o-ran/ru-fh/installer/pom.xml
index 8b9d460..4f798d4 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/installer/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/installer/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/devicemanager/o-ran/ru-fh/model/pom.xml b/features/devicemanager/o-ran/ru-fh/model/pom.xml
index bfb761e..ceb4169 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/model/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/model/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/devicemanager/o-ran/ru-fh/pom.xml b/features/devicemanager/o-ran/ru-fh/pom.xml
index 548063a..20836d1 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/devicemanager/o-ran/ru-fh/provider/pom.xml b/features/devicemanager/o-ran/ru-fh/provider/pom.xml
index 2d0da91..d7f9fbd 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/provider/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/devicemanager/x-ran/ru-fh/feature/pom.xml b/features/devicemanager/x-ran/ru-fh/feature/pom.xml
index 42cd8b6..ff05924 100644 (file)
--- a/features/devicemanager/x-ran/ru-fh/feature/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/feature/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/devicemanager/x-ran/ru-fh/installer/pom.xml b/features/devicemanager/x-ran/ru-fh/installer/pom.xml
index a8c8ea1..de31294 100755 (executable)
--- a/features/devicemanager/x-ran/ru-fh/installer/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/installer/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/devicemanager/x-ran/ru-fh/model/pom.xml b/features/devicemanager/x-ran/ru-fh/model/pom.xml
index 4456c8b..dd0b95e 100644 (file)
--- a/features/devicemanager/x-ran/ru-fh/model/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/model/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/devicemanager/x-ran/ru-fh/pom.xml b/features/devicemanager/x-ran/ru-fh/pom.xml
index f2e8db9..f4e46b2 100755 (executable)
--- a/features/devicemanager/x-ran/ru-fh/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/devicemanager/x-ran/ru-fh/provider/pom.xml b/features/devicemanager/x-ran/ru-fh/provider/pom.xml
index 7c781ee..5ddc7da 100644 (file)
--- a/features/devicemanager/x-ran/ru-fh/provider/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/provider/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 792fa54..87a72a9 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,7 +22,7 @@
   <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>