Changing odlparent pom version adding few dependencies

Issue-ID: CCSDK-3331
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I9678e4b4401791a98499ab3c39ef5b24e404aea8

diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile
index 341965d..6480fe5 100644 (file)
--- a/alpine/java11/src/main/docker/Dockerfile
+++ b/alpine/java11/src/main/docker/Dockerfile
@@ -1,6 +1,7 @@
 # Base alpine with added packages needed for open ecomp
 FROM ${base.image}:${base.image.version}
 MAINTAINER CCSDK  Team (onap-ccsdk@lists.onap.org)
+USER root
 
 ARG HTTP_PROXY
 ARG HTTPS_PROXY
@@ -11,7 +12,8 @@ ENV HTTPS_PROXY ${HTTPS_PROXY}
 ENV https_proxy ${HTTPS_PROXY}
 
 ENV JAVA_HOME /opt/java/openjdk
+
 # Add tools needed for OpenDaylight
-USER root
 RUN apk update && apk --no-cache add bash git  mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss
-USER onap
\ No newline at end of file
+
+USER onap

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index fcd72f0..36df240 100755 (executable)
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -21,17 +21,10 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-              <groupId>org.glassfish.jersey</groupId>
-              <artifactId>jersey-bom</artifactId>
-              <version>2.27</version>
-              <scope>import</scope>
-              <type>pom</type>
-          </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.1.4-SNAPSHOT</version>
+                <version>2.1.7-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -43,7 +36,6 @@
         </dependencies>
     </dependencyManagement>
 
-
     <dependencies>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -86,10 +78,6 @@
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
@@ -98,6 +86,20 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+        </dependency>
+        <!-- Below provides javax.jws -->
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-ri</artifactId>
+            <type>pom</type>
+        </dependency>
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
@@ -163,6 +165,10 @@
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-filter-base</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onap.logging-analytics</groupId>
+            <artifactId>logging-slf4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
@@ -188,6 +194,11 @@
             <artifactId>org.apache.servicemix.specs.jaxws-api-2.3</artifactId>
             <version>2.3_1</version>
         </dependency>
+        <!-- Below is required by com.google.guava : guava : jar : 28.2-jre -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>listenablefuture</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 9fbf615..d5e92cf 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -8,9 +8,7 @@
         <version>1.1.7-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli-alpine</artifactId>
-    <version>1.1.7-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli-alpine</name>
@@ -25,7 +23,7 @@
 
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-       <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
 
         <docker.verbose>true</docker.verbose>
 
@@ -39,12 +37,7 @@
         </ccsdk.odl.features>
         <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
         <ccsdk.features.version>1.1.5</ccsdk.features.version>
-        <ccsdk.sli.version>1.2.3</ccsdk.sli.version>
-        <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
-       <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.oran.a1adapter.version>1.1.5-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.oran.a1adapter.version>1.1.5</ccsdk.oran.a1adapter.version>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
     </properties>
 
@@ -60,189 +53,189 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>filters-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliapi-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>utils-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>slicore-features-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>aai-service-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>ansible-adapter-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>base-http-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>mdsal-resource-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
             <artifactId>publisher.installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>netbox-client-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>resource-assignment-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>saltstack-adapter-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sql-resource-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sliadaptors-features-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>asdcApi-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>dataChange-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>lcm-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>slinorthbound-features-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>properties-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restapi-call-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>template-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restconf-client-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>sshapi-call-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>sliplugins-features-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>

diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 81c0886..b3140fc 100644 (file)
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -1,9 +1,9 @@
 # Prepare stage for multistage image build
 ## START OF STAGE0 ##
 FROM ${base.image.name}:${project.docker.latestfulltag.version} AS stage0
+USER root
 
 # copy the opendaylight credentials
-USER root
 COPY idmlight.db.mv.db $ODL_HOME/data
 
 # copy CCSDK mvn artifacts to ODL repository
@@ -22,16 +22,16 @@ USER root
 
 ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
 ENV CCSDKFEATUREVERSION ${ccsdk.features.version}
-ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features
-ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features
+ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.version}/xml/features
+ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/features
 ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features
 ENV CCSDK_FEATURES_SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features,\
  mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-oauth/${ccsdk.features.version}/xml/features,\
  mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features,\
  mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features
 ENV CCSDK_FEATURES_SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features
-ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
-ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
+ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.version}/xml/features
+ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.version}/xml/features
 ENV A1ADAPTER_NORTHBOUND_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features
 ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
 ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}

diff --git a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile b/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
index 9ef70db..dd63d51 100644 (file)
--- a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
@@ -7,7 +7,7 @@ ENV ODL_HOME /opt/opendaylight/current
 USER root
 COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
 RUN mkdir -p /opt/odl \
-    && tar zxvf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
+    && tar xzf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
     && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \
     && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \
     && ln -s  /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \

diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 85e30ff..90c5325 100644 (file)
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${ccsdk.sli.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/pom.xml b/pom.xml
index 59c83e7..9362ced 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
@@ -49,7 +49,7 @@
         <plugins>
             <!-- Override enforcer rule to allow compile -->
             <!-- with snapshot version of ccsdk libs     -->
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>