summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--odlsli/odlsli-alpine/pom.xml26
-rw-r--r--platform-logic/installer/pom.xml12
-rw-r--r--src/main/scripts/ResolveRanges.groovy33
-rw-r--r--src/main/yaml/docker-compose.yml12
4 files changed, 60 insertions, 23 deletions
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 @@
</ccsdk.sli.features>
<!-- SLI Features Repositories -->
<ccsdk.sli.features.repo>
- 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
</ccsdk.sli.features.repo>
<docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
</properties>
@@ -250,12 +250,24 @@
<build>
<plugins>
+
<plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
+ <id>derive-resolved-versions</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>${basedir}/../../src/main/scripts/ResolveRanges.groovy</source>
+ </configuration>
+ </execution>
+ <execution>
+ <id>derive-docker-tags</id>
<phase>validate</phase>
<goals>
<goal>execute</goal>
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 @@
<name>ccsdk-distribution :: ${project.artifactId}</name>
<description>Contains platform-level service logic installer</description>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-core-artifacts</artifactId>
- <version>${ccsdk.sli.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -37,6 +26,7 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
+ <version>${ccsdk.sli.version}</version>
</dependency>
<!-- 1911: 8/22 We are missing org.osgi.framework.FrameworkUtil classes while activating DG -->
<dependency>
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"