Fix ranges to include snapshot

maven-assembly-plugin seems to exclude snapshots when resolving
ranges unless the range explicitly includes a snapshot.  Updated
ranges to end in snapshot release to work around this issue.

Issue-ID: CCSDK-3387
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I443da915e792e153eea55fdb9dc763b68471bb3c

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 6fa5f47..d75ad08 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 9e86177..bce5509 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index f0c5c2f..cfbec71 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 5b779ca..bf66e7d 100644 (file)
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 77d8abc..46ef931 100644 (file)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 8653d03..0f007a7 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 667d2dd..02aafb9 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index a8f1b86..e9429c6 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>\${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>\${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>\${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 8b20b60..c684a76 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -97,10 +97,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/oparent/pom.xml b/oparent/pom.xml
index 7227818..8a9b60d 100755 (executable)
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -68,9 +68,9 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.9999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.9999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index 27ccde6..845ea8a 100644 (file)
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -92,10 +92,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999,1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999,1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index f24ae87..20a2276 100644 (file)
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -92,10 +92,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999,1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999,1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>

diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index cf823d3..ef34740 100644 (file)
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -92,10 +92,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999,1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.1.99999,1.2.99999-SNAPSHOT)</ccsdk.cds.version>
+        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>