From 10f7357ab7b746062b4f22df2a251f11634d5d20 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 27 Jul 2021 17:03:21 -0400 Subject: [PATCH] Update parent poms to use version ranges Update parent poms to specify CCSDK repo versions using ranges Issue-ID: CCSDK-3387 Signed-off-by: Dan Timoney Change-Id: Ibe503fd109559e36d40fba90feb58dea9d1919ab --- 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 e705d0ce..6fa5f479 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 2cb5968c..9e861772 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${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 b6133969..f0c5c2fd 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index aa06bf93..5b779ca7 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${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 3afd86fa..77d8abc0 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index e9b68938..8653d031 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 78a6be11..667d2dde 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${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 84f9b226..a8f1b862 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.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) \${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 ac59df2a..8b20b60d 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -97,10 +97,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/oparent/pom.xml b/oparent/pom.xml index d7879a98..7227818c 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -68,9 +68,9 @@ true - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.9999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${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 c2f01bee..7c4a0346 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.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999,1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 254923c5..62fdb355 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -92,10 +92,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999,1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 93536c79..2ec92953 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -92,10 +92,10 @@ 1.6.9 - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + (1.1.99999,1.2.99999) + (1.1.99999, 1.2.99999) + (1.1.99999, 1.2.99999) + (1.2.99999, 1.3.99999) ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} -- 2.16.6