summaryrefslogtreecommitdiffstats
path: root/odlsli/odlsli-alpine
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 /odlsli/odlsli-alpine
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 'odlsli/odlsli-alpine')
-rw-r--r--odlsli/odlsli-alpine/pom.xml26
1 files changed, 19 insertions, 7 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>