summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhighstreetherbert <herbert.eiselt@highstreet-technologies.com>2021-05-12 18:58:18 +0200
committerhighstreetherbert <herbert.eiselt@highstreet-technologies.com>2021-05-12 19:01:06 +0200
commit5353218aca650bd2a52946c1f112733afa6f5b55 (patch)
treec8a3e89ce90b841a238de60fdf70a7da25d6b142
parenta07e237412fc8b5fd7f1cc79909320a69a977306 (diff)
Place version properties in root pom
ccsdk related versions Issue-ID: SDNC-1522 Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com> Change-Id: Iff7d56586997e85b19879e426785cf5387b654f4 Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com> Former-commit-id: 5bccac3337bb3ca27b3777c8e3f3dc3ec706eaee
-rw-r--r--installation/admportal/pom.xml2
-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.xml13
9 files changed, 18 insertions, 13 deletions
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index b8256a6e..f70ebb05 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -23,7 +23,7 @@
<image.name>onap/admportal-sdnc-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
- <ccsdk.docker.version>0.7-STAGING-latest</ccsdk.docker.version>
+ <ccsdk.docker.version>${ccsdk.docker.ubuntu.version}</ccsdk.docker.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 9d2fec21..b4f9d0dc 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.0-STAGING-latest</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 fc3f4923..75490cdd 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.1</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 d5fcd4d2..2d9e254c 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.0.1</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 6c063a50..5da89768 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.2.0-SNAPSHOT</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 ac943ddb..74231066 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.2.0-SNAPSHOT</sdnc.northbound.version>
- <ccsdk.docker.version>1.2-SNAPSHOT-latest</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 1119d3f7..b488302d 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.1</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 80862fc5..58416b7c 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.2.0-SNAPSHOT</ccsdk.distribution.version>
- </properties>
-
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index 0a937f79..ed4b3b84 100755
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,19 @@
<name>AT&amp;T</name>
</organization>
+ <properties>
+ <!-- Artifacts -->
+ <ccsdk.distribution.version>1.2.0-SNAPSHOT</ccsdk.distribution.version> <!-- Used by platform-logic/setup -->
+ <ccsdk.features.version>${ccsdk.distribution.version}</ccsdk.features.version> <!-- Used by installation/sdnc-web -->
+ <sdnc.northbound.version>${project.version}</sdnc.northbound.version> <!-- Used by installation/sdnc -->
+
+ <!-- docker images -->
+ <ccsdk.docker.alpine.j11.version>1.1.1</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
+ <ccsdk.docker.odlsli.alpine.version>1.2-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
+ <ccsdk.docker.ansible.server.version>1.0-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
+ <ccsdk.docker.ubuntu.version>0.7-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
+ </properties>
+
<modules>
<module>platform-logic</module>
<module>data-migrator</module>