aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhighstreetherbert <herbert.eiselt@highstreet-technologies.com>2021-05-21 19:20:25 +0200
committerHerbert Eiselt <herbert.eiselt@highstreet-technologies.com>2021-05-25 06:56:23 +0000
commit4ce68295eebdda1a3fdb069f6137a180a94f63e9 (patch)
treed1261f50d8571ade8626655e61e4239f819dcc29
parent697a233b0db3443d5b94843083a24ec4c7b31188 (diff)
Place version properties in root pom honolulu
ccsdk related versions Issue-ID: SDNC-1522 Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com> Change-Id: I59f99a9c88f97dc341396dffbce293e8a550f4c1 Former-commit-id: da956cbc782eddab3cfb21c2131c414a542d32b3
-rw-r--r--installation/ansible-server/pom.xml2
-rw-r--r--installation/dmaap-listener/pom.xml2
-rw-r--r--installation/pom.xml2
-rw-r--r--installation/sdnc-web/pom.xml1
-rw-r--r--installation/sdnc/pom.xml3
-rw-r--r--installation/ueb-listener/pom.xml2
-rw-r--r--platform-logic/setup/pom.xml4
-rwxr-xr-xpom.xml12
8 files changed, 16 insertions, 12 deletions
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 0d29f305..813a9b15 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -23,7 +23,7 @@
<image.name>onap/sdnc-ansible-server-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
- <ccsdk.docker.version>1.1.6</ccsdk.docker.version>
+ <ccsdk.docker.version>${ccsdk.docker.ansible.server.version}</ccsdk.docker.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index dfdd8d3b..c1b92076 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -23,7 +23,7 @@
<image.name>onap/sdnc-dmaap-listener-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
- <ccsdk.docker.version>1.1.6</ccsdk.docker.version>
+ <ccsdk.docker.version>${ccsdk.docker.alpine.j11.version}</ccsdk.docker.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
diff --git a/installation/pom.xml b/installation/pom.xml
index 3335d2a7..456772b5 100644
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -26,10 +26,8 @@
<properties>
<application.name>installation</application.name>
-
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<build.number>${maven.build.timestamp}</build.number>
- <ccsdk.distribution.version>1.1.6</ccsdk.distribution.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index caaaae6c..15f9cb9c 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -20,7 +20,6 @@
<base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo>
<image.name>onap/sdnc-web-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
- <ccsdk.features.version>1.1.5</ccsdk.features.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 9b4504a2..6ea25549 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -24,8 +24,7 @@
<standalone.image.name>onap/sdnc-image</standalone.image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
- <sdnc.northbound.version>2.1.4</sdnc.northbound.version>
- <ccsdk.docker.version>1.1.6</ccsdk.docker.version>
+ <ccsdk.docker.version>${ccsdk.docker.odlsli.alpine.version}</ccsdk.docker.version>
<sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
<sdnc.keypass><![CDATA[;:G58,7ZhqOSI:7^oZCY[9Dv]]></sdnc.keypass>
<sdnc.secureport>8443</sdnc.secureport>
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 15e7d602..61217cdd 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -23,7 +23,7 @@
<image.name>onap/sdnc-ueb-listener-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
- <ccsdk.docker.version>1.1.6</ccsdk.docker.version>
+ <ccsdk.docker.version>${ccsdk.docker.alpine.j11.version}</ccsdk.docker.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<docker.push.phase>deploy</docker.push.phase>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index 5408dc60..15478cbd 100644
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -16,10 +16,6 @@
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<description>Copies base ONAP platform-logic</description>
- <properties>
- <ccsdk.distribution.version>1.1.6</ccsdk.distribution.version>
- </properties>
-
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index cc1917b7..608de716 100755
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,18 @@
<name>AT&amp;T</name>
</organization>
+ <properties>
+ <!-- Artifacts -->
+ <ccsdk.distribution.version>1.1.6</ccsdk.distribution.version> <!-- Used by platform-logic/setup ccsdk/distribution -->
+ <ccsdk.features.version>1.1.5</ccsdk.features.version> <!-- Used by installation/sdnc-web ccsdk/features -->
+ <sdnc.northbound.version>2.1.4</sdnc.northbound.version> <!-- Used by installation/sdnc sdnc/northbound -->
+
+ <!-- docker images -->
+ <ccsdk.docker.alpine.j11.version>1.1.6</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener onap/ccsdk-alpine-j11-image -->
+ <ccsdk.docker.odlsli.alpine.version>1.1.6</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc onap/ccsdk-odlsli-alpine-image -->
+ <ccsdk.docker.ansible.server.version>1.1.6</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server onap/ccsdk-ansible-server-image -->
+ </properties>
+
<modules>
<module>platform-logic</module>
<module>data-migrator</module>