Fix versions

Updated versions of parent poms and removed a workaround in Dockerfile that breaks yangtools
dependencies with OpenDaylight Scandium release

Issue-ID: SDNC-1858
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I7c14a1fc570e2dc0069ac4473aeac0cb12e2eed0

diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index d96f093..cc08fbe 100644 (file)
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-1-starter-parent</artifactId>
-        <version>3.1.1</version>
+        <version>3.2.0</version>
         <relativePath/>
     </parent>
 

diff --git a/admportal/pom.xml b/admportal/pom.xml
index 67afae8..6a746b5 100644 (file)
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>3.1.1</version>
+        <version>3.2.0</version>
         <relativePath/>
     </parent>
 

diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index 8919031..4436867 100644 (file)
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-1-starter-parent</artifactId>
-        <version>3.1.1</version>
+        <version>3.2.0</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam.vnfbackup</groupId>

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 6d9e3ac..90b355c 100755 (executable)
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -67,8 +67,9 @@ RUN echo org.ops4j.pax.web.ssl.keypassword=\"$SDNC_KEYPASS\" >> $ODL_HOME/etc/cu
 RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
 
 # Short term fix starts: for javax.servlet-api bundle (Replacing 4.0.1 to 3.1.0 as it's unique for javax.servlet-api)
-RUN find /opt/opendaylight -name "*features*.xml" -exec sed -i -e 's|4.0.1|3.1.0|g' {} \;
+# RUN find /opt/opendaylight -name "*features*.xml" -exec sed -i -e 's|4.0.1|3.1.0|g' {} \;
 # Short term fix ends
+# Commented out by dtimoney : breaks yangtools dependencies in ODL Scandium release
 
 # Remediate log4shell vuln
 RUN apk add zip

diff --git a/pom.xml b/pom.xml
index e94634d..266d246 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.1</version>
+        <version>3.2.0</version>
         <relativePath/>
     </parent>