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: I63be4ff42c79b50aadb45635e22918aa13b76990

Former-commit-id: 24396db9c62ba9f0d4f94a3382e3b45d0d1be2a5

diff --git a/admportal/pom.xml b/admportal/pom.xml
index b8166ae..ac5c5b9 100644 (file)
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -29,21 +29,11 @@
         <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-  <groupId>org.onap.ccsdk.sli.core</groupId>
-  <artifactId>sli-core-artifacts</artifactId>
-  <version>${ccsdk.sli.core.version}</version>
-  <type>pom</type>
-  <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>

diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index b68c525..c4c0831 100644 (file)
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -13,6 +13,14 @@
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
     <description>Copies base ONAP platform-logic</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.distribution</groupId>
+            <artifactId>platform-logic-installer</artifactId>
+            <version>${ccsdk.distribution.version}</version>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
@@ -23,25 +31,14 @@
                 <version>3.0.0</version>
                 <executions>
                     <execution>
-                        <id>unpack</id>
+                        <id>unpack-dgs</id>
                         <phase>validate</phase>
                         <goals>
-                            <goal>unpack</goal>
+                            <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.onap.ccsdk.distribution</groupId>
-                                    <artifactId>platform-logic-installer</artifactId>
-                                    <version>${ccsdk.distribution.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>../target</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <outputDirectory>../target</outputDirectory>
+                            <excludeTransitive>true</excludeTransitive>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/pom.xml b/pom.xml
index cbfe496..bdf8344 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
         <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite -->
         <ccsdk.oran.a1adapter.version>1.2.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
         <sdnc.northbound.version>2.2.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc -->
+        <ccsdk.distribution.version>[1.2.0-SNAPSHOT, 1.2.99999)</ccsdk.distribution.version>
 
         <!-- docker images versions -->
         <ccsdk.docker.alpine.j11.version>1.2-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->