From 6ed584ccb2e786c7a94224d68f9709a283788242 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 27 Jul 2021 16:48:26 -0400 Subject: [PATCH] Update to support use of version ranges Updates to allow use of ranges in CCSDK version properties. Issue-ID: CCSDK-3387 Signed-off-by: Dan Timoney Change-Id: I78c9e1952c5050548b08cb3f6e1fc447ed6643f5 --- odlsli/odlsli-alpine/pom.xml | 26 +++++++++++++++++++------- platform-logic/installer/pom.xml | 12 +----------- src/main/scripts/ResolveRanges.groovy | 33 +++++++++++++++++++++++++++++++++ src/main/yaml/docker-compose.yml | 12 +++++++----- 4 files changed, 60 insertions(+), 23 deletions(-) create mode 100644 src/main/scripts/ResolveRanges.groovy diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index d5ad38b4..4e633125 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -41,10 +41,10 @@ - mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.version}/xml/features,\ - mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/features,\ - mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.version}/xml/features,\ - mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.version}/xml/features + mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${resolvedVersion.slicore-features-installer}/xml/features,\ + mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${resolvedVersion.sliadaptors-features-installer}/xml/features,\ + mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${resolvedVersion.slinorthbound-features-installer}/xml/features,\ + mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${resolvedVersion.sliplugins-features-installer}/xml/features true @@ -250,12 +250,24 @@ + - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + derive-resolved-versions + initialize + + execute + + + ${basedir}/../../src/main/scripts/ResolveRanges.groovy + + + + derive-docker-tags validate execute diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 3725333e..f5312ace 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -14,17 +14,6 @@ ccsdk-distribution :: ${project.artifactId} Contains platform-level service logic installer - - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.version} - pom - import - - - org.slf4j @@ -37,6 +26,7 @@ org.onap.ccsdk.sli.core sli-common + ${ccsdk.sli.version} diff --git a/src/main/scripts/ResolveRanges.groovy b/src/main/scripts/ResolveRanges.groovy new file mode 100644 index 00000000..856ccefa --- /dev/null +++ b/src/main/scripts/ResolveRanges.groovy @@ -0,0 +1,33 @@ +/* + * ============LICENSE_START======================================================= + * ONAP CCSDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * + */ + +package org.onap.ccsdk.distribution + +for (art in project.getArtifacts()) { + derivedVersion = art.getVersion() + if (derivedVersion.contains("-")) { + derivedVersionArray = derivedVersion.split("-") + derivedVersion = derivedVersionArray[0]+"-SNAPSHOT" + } + project.properties['resolvedVersion.' + art.getArtifactId()] = derivedVersion +} \ No newline at end of file diff --git a/src/main/yaml/docker-compose.yml b/src/main/yaml/docker-compose.yml index 4a5e57f9..ffe7c7cd 100644 --- a/src/main/yaml/docker-compose.yml +++ b/src/main/yaml/docker-compose.yml @@ -1,13 +1,13 @@ -version: '2' +version: '2.1' services: db: - image: mysql/mysql-server:5.6 + image: mariadb:10.5 container_name: ccsdk_db_container ports: - "3306" environment: - - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - MYSQL_ROOT_PASSWORD=MySecretPassword - MYSQL_ROOT_HOST=% logging: driver: "json-file" @@ -29,8 +29,10 @@ services: - db:sdnctldb01 - db:sdnctldb02 environment: - - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - MYSQL_ROOT_PASSWORD=MySecretPassword - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties + - JAVA_OPTS=-Xms512m -Xmx2048m + - KARAF_CONSOLE_LOG_LEVEL=info logging: driver: "json-file" options: @@ -54,7 +56,7 @@ services: - db:sdnctldb02 - odlsli:sdnhost environment: - - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - MYSQL_ROOT_PASSWORD=MySecretPassword - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties logging: driver: "json-file" -- 2.16.6