From 2a577ea5da129f9458b51baeb6720306d28a2442 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 5 Aug 2021 12:39:45 -0400 Subject: [PATCH] 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 Change-Id: I443da915e792e153eea55fdb9dc763b68471bb3c --- odlparent/binding-parent/pom.xml | 8 ++++---- odlparent/bundle-parent/pom.xml | 8 ++++---- odlparent/feature-repo-parent/pom.xml | 8 ++++---- odlparent/karaf4-parent/pom.xml | 8 ++++---- odlparent/mdsal-it-parent/pom.xml | 8 ++++---- odlparent/odlparent-lite/pom.xml | 8 ++++---- odlparent/odlparent/pom.xml | 8 ++++---- odlparent/setup/src/main/resources/pom-template.xml | 8 ++++---- odlparent/single-feature-parent/pom.xml | 8 ++++---- oparent/pom.xml | 6 +++--- springboot/spring-boot-setup/src/main/resources/pom-template.xml | 8 ++++---- springboot/springboot1/pom.xml | 8 ++++---- springboot/springboot2/pom.xml | 8 ++++---- 13 files changed, 51 insertions(+), 51 deletions(-) diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 6fa5f479..d75ad086 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 9e861772..bce55091 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index f0c5c2fd..cfbec71b 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 5b779ca7..bf66e7d4 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 77d8abc0..46ef931f 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 8653d031..0f007a7a 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 667d2dde..02aafb9e 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index a8f1b862..e9429c69 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.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) \${ccsdk.sli.version} \${ccsdk.sli.version} \${ccsdk.sli.version} diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 8b20b60d..c684a768 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/oparent/pom.xml b/oparent/pom.xml index 7227818c..8a9b60d5 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -68,9 +68,9 @@ true - (1.1.9999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.9999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.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 27ccde6f..845ea8a5 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.1.99999,1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999,1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index f24ae877..20a22762 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -92,10 +92,10 @@ 1.6.9 - (1.1.99999,1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999,1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index cf823d3d..ef34740a 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -92,10 +92,10 @@ 1.6.9 - (1.1.99999,1.2.99999) - (1.1.99999, 1.2.99999) - (1.1.99999, 1.2.99999) - (1.2.99999, 1.3.99999) + (1.1.99999,1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.1.99999, 1.2.99999-SNAPSHOT) + (1.2.99999, 1.3.99999-SNAPSHOT) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} -- 2.16.6