summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2021-07-27 16:48:26 -0400
committerKAPIL SINGAL <ks220y@att.com>2021-07-29 13:47:23 +0000
commit6ed584ccb2e786c7a94224d68f9709a283788242 (patch)
tree724e96fcc6ddd3f0b8b50d7b7c3ed201430a37fa /src/main
parentc3240af7248241bc15e5a08dacb66e8bc097b35c (diff)
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 <dtimoney@att.com> Change-Id: I78c9e1952c5050548b08cb3f6e1fc447ed6643f5
Diffstat (limited to 'src/main')
-rw-r--r--src/main/scripts/ResolveRanges.groovy33
-rw-r--r--src/main/yaml/docker-compose.yml12
2 files changed, 40 insertions, 5 deletions
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"