From c9cda453fb948ec06cb93a68eef56f7e0035d710 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 4 Jan 2022 10:21:18 -0500 Subject: Release parent pom version 2.2.4 Release version 2.2.4 of parent poms, which upgrades log4j2 to version 2.17.1 which resolves log4shell vulnerability. Issue-ID: CCSDK-3556 Signed-off-by: Dan Timoney Change-Id: Ic10d7170468b92cb3eb4a7f6a4ece386af2a266a --- dependencies-bom/pom.xml | 2 +- dependencies-odl-bom/pom.xml | 2 +- installed-odl-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 6 +++--- odlparent/bundle-parent/pom.xml | 6 +++--- odlparent/client-parent/pom.xml | 2 +- odlparent/feature-repo-parent/pom.xml | 6 +++--- odlparent/karaf4-parent/pom.xml | 6 +++--- odlparent/mdsal-it-parent/pom.xml | 6 +++--- odlparent/odlparent-lite/pom.xml | 6 +++--- odlparent/odlparent/pom.xml | 6 +++--- odlparent/pom.xml | 4 ++-- odlparent/setup/pom.xml | 4 ++-- odlparent/single-feature-parent/pom.xml | 6 +++--- oparent/pom.xml | 4 ++-- pom.xml | 2 +- releases/2.2.4.yaml | 5 +++++ springboot/pom.xml | 4 ++-- springboot/spring-boot-setup/pom.xml | 4 ++-- springboot/springboot1/pom.xml | 4 ++-- springboot/springboot2/pom.xml | 4 ++-- springboot/springboot25/pom.xml | 4 ++-- standalone/pom.xml | 2 +- version.properties | 2 +- 24 files changed, 52 insertions(+), 47 deletions(-) create mode 100644 releases/2.2.4.yaml diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index cebfd4fa..2301271b 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 63d9bb70..a3e50b71 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml index 1af4fb88..0d69eccb 100644 --- a/installed-odl-bom/pom.xml +++ b/installed-odl-bom/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent installed-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 84c3fd5f..0418a924 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent binding-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -195,14 +195,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 17dd130c..ae173e54 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent bundle-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -195,14 +195,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index a35b390b..29c7f1c9 100644 --- a/odlparent/client-parent/pom.xml +++ b/odlparent/client-parent/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent client-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 8d6435b5..7ec052c7 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -195,14 +195,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index ef6ee2f0..20fe6e5d 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent karaf4-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -195,14 +195,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 366f9a7b..7d21ebb6 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent mdsal-it-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -195,14 +195,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 2170829f..89ec107d 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -195,14 +195,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 5c5596f5..d913326c 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent odlparent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -195,14 +195,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/odlparent/pom.xml b/odlparent/pom.xml index b964be96..9e0e9c99 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT org.onap.ccsdk.parent odlparent-aggregator - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index 3f94efab..69247d01 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-aggregator - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT org.onap.ccsdk.parent setup - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 0a3c1473..d13582da 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -195,14 +195,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/oparent/pom.xml b/oparent/pom.xml index 4b1df011..228582d6 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.parent oparent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -96,7 +96,7 @@ otherwise ccsdk/distribution/dependencies is not resolving correctly --> org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 4324c887..cb521604 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/releases/2.2.4.yaml b/releases/2.2.4.yaml new file mode 100644 index 00000000..7241f5e7 --- /dev/null +++ b/releases/2.2.4.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '2.2.4' +project: 'ccsdk-parent' +log_dir: 'ccsdk-parent-maven-stage-istanbul/3/' diff --git a/springboot/pom.xml b/springboot/pom.xml index 952f033f..d0c2d486 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT org.onap.ccsdk.parent springboot-aggregator - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index baf2155e..c8af0d2d 100644 --- a/springboot/spring-boot-setup/pom.xml +++ b/springboot/spring-boot-setup/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent springboot-aggregator - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT org.onap.ccsdk.parent spring-boot-setup - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 68faea70..7920a370 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -150,7 +150,7 @@ org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 5503c80e..778165f3 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-starter-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -150,7 +150,7 @@ org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml index aa2fdf3f..30715d88 100644 --- a/springboot/springboot25/pom.xml +++ b/springboot/springboot25/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-25-starter-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -148,7 +148,7 @@ org.onap.ccsdk.parent dependencies-bom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom import diff --git a/standalone/pom.xml b/standalone/pom.xml index 3bc2fb58..581c0723 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.parent standalone-parent - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/version.properties b/version.properties index 035981a0..ac955bc8 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=2 sprint_number=2 -feature_revision=4 +feature_revision=5 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg