From 93807018f0e72439650288626e82636327643489 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 14 Sep 2021 11:49:59 -0400 Subject: [PATCH] Explicitly set sli version Due to issues in range expansion, version of ccsdk/sli should be set to static value 1.3.1 for Istanbul Issue-ID: CCSDK-3444 Signed-off-by: Dan Timoney Change-Id: I3ab63166ae51000e58206b795d3dd96f86240e76 --- odlparent/binding-parent/pom.xml | 2 +- odlparent/bundle-parent/pom.xml | 2 +- odlparent/feature-repo-parent/pom.xml | 2 +- odlparent/karaf4-parent/pom.xml | 2 +- odlparent/mdsal-it-parent/pom.xml | 2 +- odlparent/odlparent-lite/pom.xml | 2 +- odlparent/odlparent/pom.xml | 2 +- odlparent/setup/src/main/resources/pom-template.xml | 2 +- odlparent/single-feature-parent/pom.xml | 2 +- oparent/pom.xml | 2 +- springboot/spring-boot-setup/src/main/resources/pom-template.xml | 2 +- springboot/springboot1/pom.xml | 2 +- springboot/springboot2/pom.xml | 2 +- springboot/springboot25/pom.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 6a2473d4..1b52d531 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -100,7 +100,7 @@ (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) + 1.3.1 ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index d5682d4f..02795bcf 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -100,7 +100,7 @@ (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) + 1.3.1 ${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 7a51ea03..4023edda 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -100,7 +100,7 @@ (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) + 1.3.1 ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 72e7db6d..17eb5f8b 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -100,7 +100,7 @@ (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) + 1.3.1 ${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 8b9903ed..3bc922db 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -100,7 +100,7 @@ (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) + 1.3.1 ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index f6f30c0c..900caa5f 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -100,7 +100,7 @@ (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) + 1.3.1 ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 6aab1aff..5b6bc3b2 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -100,7 +100,7 @@ (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) + 1.3.1 ${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 3c4a905e..8f10bb51 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -100,7 +100,7 @@ (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) + 1.3.1 \${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 26657f09..4eb7bcab 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -100,7 +100,7 @@ (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) + 1.3.1 ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/oparent/pom.xml b/oparent/pom.xml index 9645e2b6..6170a636 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -70,7 +70,7 @@ (1.1.9999, 1.2.99999-SNAPSHOT) (1.1.99999, 1.2.99999-SNAPSHOT) - (1.2.99999, 1.3.99999-SNAPSHOT) + 1.3.1 ${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 b40bf601..212ab045 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml @@ -95,7 +95,7 @@ (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) + 1.3.1 ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index f91f4cb9..2106e269 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -95,7 +95,7 @@ (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) + 1.3.1 ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 682c734e..870d7e8b 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -95,7 +95,7 @@ (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) + 1.3.1 ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml index 5e100159..3f56ae05 100644 --- a/springboot/springboot25/pom.xml +++ b/springboot/springboot25/pom.xml @@ -92,7 +92,7 @@ (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) + 1.3.1 ${ccsdk.sli.version} ${ccsdk.sli.version} ${ccsdk.sli.version} -- 2.16.6