From a50b00347c35a59903634ed294ff01c37233885f Mon Sep 17 00:00:00 2001 From: Chuck Bridgham Date: Mon, 28 Oct 2024 13:28:10 -0400 Subject: [PATCH 1/4] Upgrading levels for Spring 5/ SB 2.x --- dev/cnf/resources/bnd/bundle.spring.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/cnf/resources/bnd/bundle.spring.props b/dev/cnf/resources/bnd/bundle.spring.props index 03c1b86c719..a479c6c51f4 100644 --- a/dev/cnf/resources/bnd/bundle.spring.props +++ b/dev/cnf/resources/bnd/bundle.spring.props @@ -29,9 +29,9 @@ springBootVersion15=strategy=exact;version=1.5.9.RELEASE springVersion15=strategy=exact;version=4.3.13.RELEASE springSecurityVersion15=strategy=exact;version=4.2.3.RELEASE -springBootVersion20=strategy=exact;version=2.2.5.RELEASE -springVersion20=strategy=exact;version=5.2.4.RELEASE -springSecurityVersion20=strategy=exact;version=5.2.2.RELEASE +springBootVersion20=strategy=exact;version=2.7.9.RELEASE +springVersion20=strategy=exact;version=5.3.39.RELEASE +springSecurityVersion20=strategy=exact;version=5.7.13.RELEASE springAOPVersion20=strategy=exact;version=5.3.21 springExpressionVersion20=strategy=exact;version=5.3.21 @@ -39,9 +39,9 @@ springWebFluxVersion20=strategy=exact;version=5.3.21 springWebSocketVersion20=strategy=exact;version=5.0.8.RELEASE springSecurityCryptoVersion20=strategy=exact;version=5.6.2 -springBootVersion30=strategy=exact;version=3.0.4 -springVersion30=strategy=exact;version=6.0.6 -springSecurityVersion30=strategy=exact;version=6.0.3 +springBootVersion30=strategy=exact;version=3.3.5 +springVersion30=strategy=exact;version=6.1.14 +springSecurityVersion30=strategy=exact;version=6.3.4 checkpointSpringBootVersion30=strategy=exact;version=3.2.4 checkpointSpringVersion30=strategy=exact;version=6.1.5 From 35f0087d0b145dc5c6703f1290b0bd1c78670bb2 Mon Sep 17 00:00:00 2001 From: Chuck Bridgham Date: Mon, 28 Oct 2024 13:46:42 -0400 Subject: [PATCH 2/4] Update index --- dev/cnf/oss_dependencies.maven | 55 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index d1728cbf5ef..6742dbcee6f 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -886,67 +886,66 @@ org.slf4j:slf4j-jdk14:1.7.36 org.slf4j:slf4j-simple:1.7.36 org.sonatype.goodies:package-url-java:1.0.1 org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE -org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE -org.springframework.boot:spring-boot-autoconfigure:3.0.4 -org.springframework.boot:spring-boot-autoconfigure:3.2.4 +org.springframework.boot:spring-boot-autoconfigure:2.7.9.RELEASE +org.springframework.boot:spring-boot-autoconfigure:3.3.5 org.springframework.boot:spring-boot:1.5.9.RELEASE -org.springframework.boot:spring-boot:2.2.5.RELEASE -org.springframework.boot:spring-boot:3.0.4 -org.springframework.boot:spring-boot:3.2.4 +org.springframework.boot:spring-boot:2.7.9.RELEASE +org.springframework.boot:spring-boot:3.3.5 org.springframework.data:spring-data-commons:3.2.4 org.springframework.security:spring-security-config:4.2.3.RELEASE -org.springframework.security:spring-security-config:5.2.2.RELEASE -org.springframework.security:spring-security-config:6.0.3 +org.springframework.security:spring-security-config:5.7.13.RELEASE +org.springframework.security:spring-security-config:6.3.4 org.springframework.security:spring-security-core:4.2.3.RELEASE -org.springframework.security:spring-security-core:5.2.2.RELEASE -org.springframework.security:spring-security-core:6.0.3 +org.springframework.security:spring-security-core:5.7.13.RELEASE +org.springframework.security:spring-security-core:6.3.4 org.springframework.security:spring-security-crypto:5.6.2 -org.springframework.security:spring-security-crypto:6.0.3 +org.springframework.security:spring-security-crypto:6.3.4 org.springframework.security:spring-security-web:4.2.3.RELEASE -org.springframework.security:spring-security-web:5.2.2.RELEASE +org.springframework.security:spring-security-web:5.7.13.RELEASE org.springframework.security:spring-security-web:5.7.2 -org.springframework.security:spring-security-web:6.0.3 +org.springframework.security:spring-security-web:6.3.4 org.springframework:spring-aop:3.0.7.RELEASE org.springframework:spring-aop:4.3.13.RELEASE -org.springframework:spring-aop:5.2.4.RELEASE org.springframework:spring-aop:5.3.21 -org.springframework:spring-aop:6.0.6 +org.springframework:spring-aop:5.3.39.RELEASE +org.springframework:spring-aop:6.1.14 org.springframework:spring-asm:3.0.7.RELEASE org.springframework:spring-beans:3.0.7.RELEASE org.springframework:spring-beans:4.3.13.RELEASE -org.springframework:spring-beans:5.2.4.RELEASE -org.springframework:spring-beans:6.0.6 +org.springframework:spring-beans:5.3.39.RELEASE +org.springframework:spring-beans:6.1.14 org.springframework:spring-beans:6.1.5 org.springframework:spring-context:3.0.7.RELEASE org.springframework:spring-context:4.3.13.RELEASE -org.springframework:spring-context:5.2.4.RELEASE -org.springframework:spring-context:6.0.6 +org.springframework:spring-context:5.3.39.RELEASE +org.springframework:spring-context:6.1.14 org.springframework:spring-context:6.1.5 org.springframework:spring-core:3.0.7.RELEASE org.springframework:spring-core:4.3.13.RELEASE -org.springframework:spring-core:5.2.4.RELEASE -org.springframework:spring-core:6.0.6 +org.springframework:spring-core:5.3.39.RELEASE +org.springframework:spring-core:6.1.14 org.springframework:spring-core:6.1.5 org.springframework:spring-expression:3.0.7.RELEASE org.springframework:spring-expression:4.3.13.RELEASE -org.springframework:spring-expression:5.2.4.RELEASE org.springframework:spring-expression:5.3.21 -org.springframework:spring-expression:6.0.6 +org.springframework:spring-expression:5.3.39.RELEASE +org.springframework:spring-expression:6.1.14 org.springframework:spring-web:3.0.7.RELEASE org.springframework:spring-web:4.3.13.RELEASE -org.springframework:spring-web:5.2.4.RELEASE -org.springframework:spring-web:6.0.6 +org.springframework:spring-web:5.3.39.RELEASE +org.springframework:spring-web:6.1.14 org.springframework:spring-web:6.1.5 org.springframework:spring-webflux:5.3.21 -org.springframework:spring-webflux:6.0.6 +org.springframework:spring-webflux:6.1.14 org.springframework:spring-webflux:6.1.5 org.springframework:spring-webmvc:4.3.13.RELEASE -org.springframework:spring-webmvc:5.2.4.RELEASE -org.springframework:spring-webmvc:6.0.6 +org.springframework:spring-webmvc:5.3.39.RELEASE +org.springframework:spring-webmvc:6.1.14 org.springframework:spring-websocket:4.3.13.RELEASE org.springframework:spring-websocket:5.0.8.RELEASE org.springframework:spring-websocket:5.3.21 org.springframework:spring-websocket:6.0.6 +org.springframework:spring-websocket:6.1.14 org.testcontainers:database-commons:1.20.3 org.testcontainers:db2:1.20.3 org.testcontainers:jdbc:1.20.3 From 2c1fc0490e948d959419e25de2a7f433342f7195 Mon Sep 17 00:00:00 2001 From: Chuck Bridgham Date: Tue, 29 Oct 2024 14:37:04 -0400 Subject: [PATCH 3/4] Remove RELEASE snapshots --- dev/cnf/oss_dependencies.maven | 11 +++++------ dev/cnf/resources/bnd/bundle.spring.props | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index 6742dbcee6f..dbc3b98f057 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -886,23 +886,22 @@ org.slf4j:slf4j-jdk14:1.7.36 org.slf4j:slf4j-simple:1.7.36 org.sonatype.goodies:package-url-java:1.0.1 org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE -org.springframework.boot:spring-boot-autoconfigure:2.7.9.RELEASE +org.springframework.boot:spring-boot-autoconfigure:2.7.18 org.springframework.boot:spring-boot-autoconfigure:3.3.5 org.springframework.boot:spring-boot:1.5.9.RELEASE -org.springframework.boot:spring-boot:2.7.9.RELEASE +org.springframework.boot:spring-boot:2.7.18 org.springframework.boot:spring-boot:3.3.5 org.springframework.data:spring-data-commons:3.2.4 org.springframework.security:spring-security-config:4.2.3.RELEASE -org.springframework.security:spring-security-config:5.7.13.RELEASE +org.springframework.security:spring-security-config:5.7.13 org.springframework.security:spring-security-config:6.3.4 org.springframework.security:spring-security-core:4.2.3.RELEASE -org.springframework.security:spring-security-core:5.7.13.RELEASE +org.springframework.security:spring-security-core:5.7.13 org.springframework.security:spring-security-core:6.3.4 org.springframework.security:spring-security-crypto:5.6.2 org.springframework.security:spring-security-crypto:6.3.4 org.springframework.security:spring-security-web:4.2.3.RELEASE -org.springframework.security:spring-security-web:5.7.13.RELEASE -org.springframework.security:spring-security-web:5.7.2 +org.springframework.security:spring-security-web:5.7.13 org.springframework.security:spring-security-web:6.3.4 org.springframework:spring-aop:3.0.7.RELEASE org.springframework:spring-aop:4.3.13.RELEASE diff --git a/dev/cnf/resources/bnd/bundle.spring.props b/dev/cnf/resources/bnd/bundle.spring.props index a479c6c51f4..4eea6c925ac 100644 --- a/dev/cnf/resources/bnd/bundle.spring.props +++ b/dev/cnf/resources/bnd/bundle.spring.props @@ -29,9 +29,9 @@ springBootVersion15=strategy=exact;version=1.5.9.RELEASE springVersion15=strategy=exact;version=4.3.13.RELEASE springSecurityVersion15=strategy=exact;version=4.2.3.RELEASE -springBootVersion20=strategy=exact;version=2.7.9.RELEASE +springBootVersion20=strategy=exact;version=2.7.18 springVersion20=strategy=exact;version=5.3.39.RELEASE -springSecurityVersion20=strategy=exact;version=5.7.13.RELEASE +springSecurityVersion20=strategy=exact;version=5.7.13 springAOPVersion20=strategy=exact;version=5.3.21 springExpressionVersion20=strategy=exact;version=5.3.21 From 92ea6c6edb8f8ac6e0735a22f9135783e6a978e6 Mon Sep 17 00:00:00 2001 From: Chuck Bridgham Date: Tue, 29 Oct 2024 15:32:43 -0400 Subject: [PATCH 4/4] Removing older unused versions --- .../check_this_in_if_it_changes/pom.xml | 105 +++++------------- dev/cnf/oss_dependencies.maven | 23 ++-- dev/cnf/resources/bnd/bundle.spring.props | 8 +- 3 files changed, 42 insertions(+), 94 deletions(-) diff --git a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml index e0578d3e84b..cb33d0a916e 100644 --- a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml +++ b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml @@ -4454,17 +4454,12 @@ org.springframework.boot spring-boot-autoconfigure - 2.2.5.RELEASE + 2.7.18 org.springframework.boot spring-boot-autoconfigure - 3.0.4 - - - org.springframework.boot - spring-boot-autoconfigure - 3.2.4 + 3.3.5 org.springframework.boot @@ -4474,17 +4469,12 @@ org.springframework.boot spring-boot - 2.2.5.RELEASE + 2.7.18 org.springframework.boot spring-boot - 3.0.4 - - - org.springframework.boot - spring-boot - 3.2.4 + 3.3.5 org.springframework.data @@ -4499,12 +4489,12 @@ org.springframework.security spring-security-config - 5.2.2.RELEASE + 5.7.13 org.springframework.security spring-security-config - 6.0.3 + 6.3.4 org.springframework.security @@ -4514,12 +4504,12 @@ org.springframework.security spring-security-core - 5.2.2.RELEASE + 5.7.13 org.springframework.security spring-security-core - 6.0.3 + 6.3.4 org.springframework.security @@ -4529,7 +4519,7 @@ org.springframework.security spring-security-crypto - 6.0.3 + 6.3.4 org.springframework.security @@ -4539,17 +4529,12 @@ org.springframework.security spring-security-web - 5.2.2.RELEASE + 5.7.13 org.springframework.security spring-security-web - 5.7.2 - - - org.springframework.security - spring-security-web - 6.0.3 + 6.3.4 org.springframework @@ -4564,17 +4549,17 @@ org.springframework spring-aop - 5.2.4.RELEASE + 5.3.21 org.springframework spring-aop - 5.3.21 + 5.3.39 org.springframework spring-aop - 6.0.6 + 6.1.14 org.springframework @@ -4594,17 +4579,12 @@ org.springframework spring-beans - 5.2.4.RELEASE + 5.3.39 org.springframework spring-beans - 6.0.6 - - - org.springframework - spring-beans - 6.1.5 + 6.1.14 org.springframework @@ -4619,17 +4599,12 @@ org.springframework spring-context - 5.2.4.RELEASE + 5.3.39 org.springframework spring-context - 6.0.6 - - - org.springframework - spring-context - 6.1.5 + 6.1.14 org.springframework @@ -4644,17 +4619,12 @@ org.springframework spring-core - 5.2.4.RELEASE + 5.3.39 org.springframework spring-core - 6.0.6 - - - org.springframework - spring-core - 6.1.5 + 6.1.14 org.springframework @@ -4669,17 +4639,17 @@ org.springframework spring-expression - 5.2.4.RELEASE + 5.3.21 org.springframework spring-expression - 5.3.21 + 5.3.39 org.springframework spring-expression - 6.0.6 + 6.1.14 org.springframework @@ -4694,17 +4664,12 @@ org.springframework spring-web - 5.2.4.RELEASE - - - org.springframework - spring-web - 6.0.6 + 5.3.39 org.springframework spring-web - 6.1.5 + 6.1.14 org.springframework @@ -4714,12 +4679,7 @@ org.springframework spring-webflux - 6.0.6 - - - org.springframework - spring-webflux - 6.1.5 + 6.1.14 org.springframework @@ -4729,12 +4689,12 @@ org.springframework spring-webmvc - 5.2.4.RELEASE + 5.3.39 org.springframework spring-webmvc - 6.0.6 + 6.1.14 org.springframework @@ -4744,17 +4704,12 @@ org.springframework spring-websocket - 5.0.8.RELEASE - - - org.springframework - spring-websocket - 5.3.21 + 5.3.39 org.springframework spring-websocket - 6.0.6 + 6.1.14 org.testcontainers diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index dbc3b98f057..09d4da3f411 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -906,44 +906,37 @@ org.springframework.security:spring-security-web:6.3.4 org.springframework:spring-aop:3.0.7.RELEASE org.springframework:spring-aop:4.3.13.RELEASE org.springframework:spring-aop:5.3.21 -org.springframework:spring-aop:5.3.39.RELEASE +org.springframework:spring-aop:5.3.39 org.springframework:spring-aop:6.1.14 org.springframework:spring-asm:3.0.7.RELEASE org.springframework:spring-beans:3.0.7.RELEASE org.springframework:spring-beans:4.3.13.RELEASE -org.springframework:spring-beans:5.3.39.RELEASE +org.springframework:spring-beans:5.3.39 org.springframework:spring-beans:6.1.14 -org.springframework:spring-beans:6.1.5 org.springframework:spring-context:3.0.7.RELEASE org.springframework:spring-context:4.3.13.RELEASE -org.springframework:spring-context:5.3.39.RELEASE +org.springframework:spring-context:5.3.39 org.springframework:spring-context:6.1.14 -org.springframework:spring-context:6.1.5 org.springframework:spring-core:3.0.7.RELEASE org.springframework:spring-core:4.3.13.RELEASE -org.springframework:spring-core:5.3.39.RELEASE +org.springframework:spring-core:5.3.39 org.springframework:spring-core:6.1.14 -org.springframework:spring-core:6.1.5 org.springframework:spring-expression:3.0.7.RELEASE org.springframework:spring-expression:4.3.13.RELEASE org.springframework:spring-expression:5.3.21 -org.springframework:spring-expression:5.3.39.RELEASE +org.springframework:spring-expression:5.3.39 org.springframework:spring-expression:6.1.14 org.springframework:spring-web:3.0.7.RELEASE org.springframework:spring-web:4.3.13.RELEASE -org.springframework:spring-web:5.3.39.RELEASE +org.springframework:spring-web:5.3.39 org.springframework:spring-web:6.1.14 -org.springframework:spring-web:6.1.5 org.springframework:spring-webflux:5.3.21 org.springframework:spring-webflux:6.1.14 -org.springframework:spring-webflux:6.1.5 org.springframework:spring-webmvc:4.3.13.RELEASE -org.springframework:spring-webmvc:5.3.39.RELEASE +org.springframework:spring-webmvc:5.3.39 org.springframework:spring-webmvc:6.1.14 org.springframework:spring-websocket:4.3.13.RELEASE -org.springframework:spring-websocket:5.0.8.RELEASE -org.springframework:spring-websocket:5.3.21 -org.springframework:spring-websocket:6.0.6 +org.springframework:spring-websocket:5.3.39 org.springframework:spring-websocket:6.1.14 org.testcontainers:database-commons:1.20.3 org.testcontainers:db2:1.20.3 diff --git a/dev/cnf/resources/bnd/bundle.spring.props b/dev/cnf/resources/bnd/bundle.spring.props index 4eea6c925ac..5bb72edd621 100644 --- a/dev/cnf/resources/bnd/bundle.spring.props +++ b/dev/cnf/resources/bnd/bundle.spring.props @@ -30,21 +30,21 @@ springVersion15=strategy=exact;version=4.3.13.RELEASE springSecurityVersion15=strategy=exact;version=4.2.3.RELEASE springBootVersion20=strategy=exact;version=2.7.18 -springVersion20=strategy=exact;version=5.3.39.RELEASE +springVersion20=strategy=exact;version=5.3.39 springSecurityVersion20=strategy=exact;version=5.7.13 springAOPVersion20=strategy=exact;version=5.3.21 springExpressionVersion20=strategy=exact;version=5.3.21 springWebFluxVersion20=strategy=exact;version=5.3.21 -springWebSocketVersion20=strategy=exact;version=5.0.8.RELEASE +springWebSocketVersion20=strategy=exact;version=5.3.39 springSecurityCryptoVersion20=strategy=exact;version=5.6.2 springBootVersion30=strategy=exact;version=3.3.5 springVersion30=strategy=exact;version=6.1.14 springSecurityVersion30=strategy=exact;version=6.3.4 -checkpointSpringBootVersion30=strategy=exact;version=3.2.4 -checkpointSpringVersion30=strategy=exact;version=6.1.5 +checkpointSpringBootVersion30=strategy=exact;version=3.3.5 +checkpointSpringVersion30=strategy=exact;version=6.1.14 # https://mvnrepository.com/artifact/org.springframework.security # org.springframework.security ยป spring-security-core