From fc00621f92f98af7c92b20c0736d4da37cb7a341 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 5 Oct 2021 15:55:28 -0400 Subject: [PATCH] Fix ranges to include snapshots Fix range so that snapshots are included Issue-ID: CCSDK-3470 Signed-off-by: Dan Timoney Change-Id: I8a3f59b59d0c9d347a259fa093470371fb169902 --- dependencies-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 12 ++++++------ odlparent/bundle-parent/pom.xml | 12 ++++++------ odlparent/feature-repo-parent/pom.xml | 12 ++++++------ odlparent/karaf4-parent/pom.xml | 12 ++++++------ odlparent/mdsal-it-parent/pom.xml | 12 ++++++------ odlparent/odlparent-lite/pom.xml | 12 ++++++------ odlparent/odlparent/pom.xml | 12 ++++++------ odlparent/setup/src/main/resources/pom-template.xml | 12 ++++++------ odlparent/single-feature-parent/pom.xml | 12 ++++++------ oparent/pom.xml | 6 +++--- .../spring-boot-setup/src/main/resources/pom-template.xml | 8 ++++---- springboot/springboot1/pom.xml | 8 ++++---- springboot/springboot2/pom.xml | 8 ++++---- 14 files changed, 70 insertions(+), 70 deletions(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index f1cb6ec6..347e0725 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -185,7 +185,7 @@ org.apache.commons commons-lang3 - 3.11 + 3.12.0 org.apache.commons diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 06f91a79..443e490b 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} @@ -121,13 +121,13 @@ 1.15 - 3.11 + 3.12.0 2.6 3.8.0 - 2.7.7 + 2.7.8 4.4.1 diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 87f19ca6..8f65566c 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} @@ -121,13 +121,13 @@ 1.15 - 3.11 + 3.12.0 2.6 3.8.0 - 2.7.7 + 2.7.8 4.4.1 diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 4079c429..ffd3df9b 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} @@ -121,13 +121,13 @@ 1.15 - 3.11 + 3.12.0 2.6 3.8.0 - 2.7.7 + 2.7.8 4.4.1 diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 37bd925f..d68a268e 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} @@ -121,13 +121,13 @@ 1.15 - 3.11 + 3.12.0 2.6 3.8.0 - 2.7.7 + 2.7.8 4.4.1 diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 72adbf56..25fce1d4 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} @@ -121,13 +121,13 @@ 1.15 - 3.11 + 3.12.0 2.6 3.8.0 - 2.7.7 + 2.7.8 4.4.1 diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index fed50d3e..fa80a2eb 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} @@ -121,13 +121,13 @@ 1.15 - 3.11 + 3.12.0 2.6 3.8.0 - 2.7.7 + 2.7.8 4.4.1 diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 00cadfd4..ddd2caa1 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} @@ -121,13 +121,13 @@ 1.15 - 3.11 + 3.12.0 2.6 3.8.0 - 2.7.7 + 2.7.8 4.4.1 diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 1e5218b8..b37096ce 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] \${ccsdk.sli.version} \${ccsdk.sli.version} \${ccsdk.sli.version} @@ -121,13 +121,13 @@ 1.15 - 3.11 + 3.12.0 2.6 3.8.0 - 2.7.7 + 2.7.8 4.4.1 diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index a61c68a1..775d7147 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} @@ -121,13 +121,13 @@ 1.15 - 3.11 + 3.12.0 2.6 3.8.0 - 2.7.7 + 2.7.8 4.4.1 diff --git a/oparent/pom.xml b/oparent/pom.xml index 8084f24a..9933df58 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -68,9 +68,9 @@ true - (1.2.9999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.9999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.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 2703ab10..0271683d 100644 --- 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 @@ 1.6.9 - (1.2.99999,1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999,1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index e5cf654e..eea18016 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -92,10 +92,10 @@ 1.6.9 - (1.2.99999,1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999,1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index d938b1f5..54cfe3aa 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -92,10 +92,10 @@ 1.6.9 - (1.2.99999,1.3.99999) - (1.2.99999, 1.3.99999) - (1.2.99999, 1.3.99999) - (1.3.99999, 1.4.99999) + (1.2.99999,1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.2.99999, 1.3.99999-SNAPSHOT] + (1.3.99999, 1.4.99999-SNAPSHOT] ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} -- 2.16.6