From e1c55fde79cb22fcc0c6223e4cd1b268751b6839 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Nov 2023 14:33:54 +0100 Subject: [PATCH 001/146] Prepare next development iteration. See #2155 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 184588a7..243ef09c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.0 + 3.2.1-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.0 + 3.2.1-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.0 + 3.2.1-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 6d9d0458..0b1ee6c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.0 + 3.2.1-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 42a06db4..28566e62 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.0 + 3.2.1-SNAPSHOT ../pom.xml From 071bbb931d9818638d7c4f5b49736a6baff168c5 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Nov 2023 14:33:55 +0100 Subject: [PATCH 002/146] After release cleanups. See #2155 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 243ef09c..74efa9f1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.0 - 2023.1.0 + 2023.1.1-SNAPSHOT @@ -1424,8 +1424,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From a63437be8b8b3587499eb374d2c5d51c86a75178 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 23 Nov 2023 11:02:59 +0100 Subject: [PATCH 003/146] Upgrade to Spring Framework 6.1.1. Closes #2178 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 74efa9f1..c9bee05c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.0 + 6.1.1 src/main/antora/antora-playbook.yml 0.0.3 0.0.7 @@ -874,7 +874,7 @@ spring6-next - 6.1.0-SNAPSHOT + 6.1.2-SNAPSHOT From cdd24c776c7ddca9ba82babfb0129685df1cebcf Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 23 Nov 2023 15:05:46 +0100 Subject: [PATCH 004/146] Introduce property for Jenkins user and Artifactory server details. Closes #2177 --- Jenkinsfile | 36 ++++++++++++++++++------------------ ci/pipeline.properties | 3 +++ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1cbb520b..4b6415cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,11 +31,11 @@ pipeline { steps { script { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { - sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' + - 'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' + - 'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' + - 'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' + - './mvnw -s settings.xml clean dependency:list verify -Dsort -B' + sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + + "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + + "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + + "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + + "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" } } } @@ -63,11 +63,11 @@ pipeline { steps { script { docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) { - sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' + - 'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' + - 'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' + - 'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' + - './mvnw -s settings.xml clean dependency:list verify -Dsort -B' + sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + + "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + + "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + + "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + + "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" } } } @@ -90,18 +90,18 @@ pipeline { steps { script { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { - sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' + - 'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' + - 'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' + - 'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' + - './mvnw -s settings.xml -Pci,artifactory ' + - '-Dartifactory.server=https://repo.spring.io ' + + sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + + "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + + "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + + "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + + "./mvnw -s settings.xml -Pci,artifactory " + + "-Dartifactory.server=${p['artifactory.url']} " + "-Dartifactory.username=${ARTIFACTORY_USR} " + "-Dartifactory.password=${ARTIFACTORY_PSW} " + - "-Dartifactory.staging-repository=libs-snapshot-local " + + "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " + "-Dartifactory.build-name=spring-data-build " + "-Dartifactory.build-number=${BUILD_NUMBER} " + - '-Dmaven.test.skip=true clean deploy -B -U' + "-Dmaven.test.skip=true clean deploy -B -U" } } } diff --git a/ci/pipeline.properties b/ci/pipeline.properties index d65c9db5..dc8b6fb0 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -26,5 +26,8 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock - docker.registry= docker.credentials=hub.docker.com-springbuildmaster artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c +artifactory.url=https://repo.spring.io +artifactory.repository.snapshot=libs-snapshot-local develocity.cache.credentials=gradle_enterprise_cache_user develocity.access-key=gradle_enterprise_secret_access_key +jenkins.user.name=spring-builds+jenkins From 847e1aee196c272f4770e5567eb479e3c7cd29e1 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 1 Dec 2023 08:10:41 +0100 Subject: [PATCH 005/146] Upgrade to logback-classic 1.4.13. Closes #2179 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index c9bee05c..6b72587f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,7 +118,7 @@ 5.10.1 1.9.20 1.7.3 - 1.4.1 + 1.4.13 1.12.0 1.2.0 5.5.0 From 2b074966ce47bcfcdbcf8862f00de551d76e9875 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 11 Dec 2023 09:02:08 +0100 Subject: [PATCH 006/146] Build against Spring Framework 6.1.2 snapshots. See #2185 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6b72587f..dfb8d472 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.1 + 6.1.2-SNAPSHOT src/main/antora/antora-playbook.yml 0.0.3 0.0.7 From 4a0753f9df8921b68a14ccab01c88fbe622b1052 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 11 Dec 2023 09:58:27 +0100 Subject: [PATCH 007/146] Build against Reactor 2023.0.1 snapshots. See #2182 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index dfb8d472..851952f4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.0 + 2023.0.1-SNAPSHOT 2.2.21 3.1.8 1.10.0 From 5feca04bd939cef2f8674cf040623cc772a0059d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 11 Dec 2023 09:59:10 +0100 Subject: [PATCH 008/146] Build against Micrometer 1.12.1 snapshots. See #2181 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 851952f4..f9130424 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.20 1.7.3 1.4.13 - 1.12.0 - 1.2.0 + 1.12.1-SNAPSHOT + 1.2.1-SNAPSHOT 5.5.0 1.13.7 5.0.0 From 69aa1d6620a7527a9c9bff6652a307a0c3660097 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Dec 2023 08:26:19 +0100 Subject: [PATCH 009/146] Upgrade to Reactor 2023.0.1. Closes #2182 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f9130424..806f48ac 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.1-SNAPSHOT + 2023.0.1 2.2.21 3.1.8 1.10.0 From 5985e94658f67bec8198e76ae0d3017f671e89a8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Dec 2023 08:26:39 +0100 Subject: [PATCH 010/146] Upgrade to Micrometer 1.12.1. Closes #2181 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 806f48ac..74043d16 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.20 1.7.3 1.4.13 - 1.12.1-SNAPSHOT - 1.2.1-SNAPSHOT + 1.12.1 + 1.2.1 5.5.0 1.13.7 5.0.0 From 7d76def8885e1fdc0d5528713bbda4a3f617dcac Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Dec 2023 08:30:18 +0100 Subject: [PATCH 011/146] Upgrade to Kotlin 1.9.21. See #2187 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 74043d16..867f086d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + 4.13.2 5.10.1 - 1.9.20 + 1.9.21 1.7.3 1.4.13 1.12.1 @@ -1440,4 +1439,4 @@ - + \ No newline at end of file From b92c1f89bce31e12e928049882b73dbd69adfd6e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Dec 2023 08:30:18 +0100 Subject: [PATCH 012/146] Upgrade to Testcontainers 1.19.3. See #2188 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 867f086d..523e4bf8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -135,7 +135,7 @@ 2.2.0 3.0.0 6.0.0 - 1.19.2 + 1.19.3 3.0.2 0.10.4 4.0.0 From f99fdaf8999d33a5b58b13464c1545f37197463b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Dec 2023 08:30:19 +0100 Subject: [PATCH 013/146] Upgrade to AspectJ 1.9.21. See #2186 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 523e4bf8..02337a4b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -98,7 +98,7 @@ 1.1.3 1.0.0 - 1.9.20.1 + 1.9.21 3.24.2 4.0.1 2.5 From 0725184e8ff35c09695787ce3729d2ddf567737a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Dec 2023 08:30:19 +0100 Subject: [PATCH 014/146] Upgrade to OpenWebBeans 4.0.1. See #2189 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 02337a4b..d9e4bdd9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -138,7 +138,7 @@ 1.19.3 3.0.2 0.10.4 - 4.0.0 + 4.0.1 2023.1.1-SNAPSHOT From 5f4677aa80303e91fd8cb8b289796a7ead9cd58e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Dec 2023 08:34:04 +0100 Subject: [PATCH 015/146] Upgrade to Maven Wrapper 3.9.6. See #2192 --- .mvn/wrapper/maven-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 4a225262..4281eea4 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -#Wed Oct 04 16:57:59 PDT 2023 -distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +#Thu Dec 14 08:34:04 CET 2023 +distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip From 8d1863289226b18b38304639396d57d6bb50a623 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Dec 2023 08:44:57 +0100 Subject: [PATCH 016/146] Upgrade to Java 17.0.9 and 21.0.1. Closes #2195 --- ci/pipeline.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pipeline.properties b/ci/pipeline.properties index dc8b6fb0..60057f26 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,6 +1,6 @@ # Java versions -java.main.tag=17.0.8_7-jdk-focal -java.next.tag=21_35-jdk-jammy +java.main.tag=17.0.9_9-jdk-focal +java.next.tag=21.0.1_12-jdk-jammy # Docker container images - standard docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag} From 02af91fc278fd787ed21bbb4b5c1abba64b3e21e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Dec 2023 14:59:32 +0100 Subject: [PATCH 017/146] Upgrade to Spring Framework 6.1.2. Closes #2185 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index d9e4bdd9..3f063767 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.2-SNAPSHOT + 6.1.2 src/main/antora/antora-playbook.yml 0.0.3 0.0.7 @@ -1439,4 +1439,4 @@ - \ No newline at end of file + From eeab26d6b10c1b9ad006fce4975d19ca88599894 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Dec 2023 14:11:22 +0100 Subject: [PATCH 018/146] Prepare 3.2.1 (2023.1.1). See #2175 --- parent/pom.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3f063767..a2271782 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2023.1.1-SNAPSHOT + 2023.1.1 @@ -396,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.1-SNAPSHOT + 3.2.1 zip true @@ -1423,20 +1424,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 1daeaecccdd8c142a748ed77530ad6cff9a1bf68 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Dec 2023 14:11:52 +0100 Subject: [PATCH 019/146] Release version 3.2.1 (2023.1.1). See #2175 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a2271782..654f50e7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.1-SNAPSHOT + 3.2.1 ../pom.xml @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.1-SNAPSHOT + 3.2.1 zip true diff --git a/pom.xml b/pom.xml index 0b1ee6c7..70b18ec5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.1-SNAPSHOT + 3.2.1 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 28566e62..a6ac4fda 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.1-SNAPSHOT + 3.2.1 ../pom.xml From f643c1ce3bd91adbcfaa7dfce6ee917b7a46a591 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Dec 2023 14:15:18 +0100 Subject: [PATCH 020/146] Prepare next development iteration. See #2175 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 654f50e7..b211b648 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.1 + 3.2.2-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.1 + 3.2.2-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.1 + 3.2.2-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 70b18ec5..3b70e00c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.1 + 3.2.2-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index a6ac4fda..616795ab 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.1 + 3.2.2-SNAPSHOT ../pom.xml From 34f6c6242a8db85db8182aa45af5e781d0dab3d2 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Dec 2023 14:15:21 +0100 Subject: [PATCH 021/146] After release cleanups. See #2175 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b211b648..7b420634 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.1 - 2023.1.1 + 2023.1.2-SNAPSHOT @@ -1424,8 +1424,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 8c8dff5d95c7e2a897891eae1c9f386d5201a2c4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 2 Jan 2024 13:54:16 +0100 Subject: [PATCH 022/146] Extend license header copyright years to 2024. See #2200 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b70e00c..eaf0288e 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2010-2023 the original author or authors. + Copyright 2010-2024 the original author or authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From ceb86c2f8904e7928cbefd293c75c375c5d44ea6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 4 Jan 2024 09:19:14 +0100 Subject: [PATCH 023/146] Build against Spring Framework 6.1.3 snapshots. See #2202 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7b420634..e92ffd2c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.2 + 6.1.3-SNAPSHOT src/main/antora/antora-playbook.yml 0.0.3 0.0.7 From 0dae7c99b5df3de41aeb8232a5e129d1b19d8767 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 4 Jan 2024 09:19:39 +0100 Subject: [PATCH 024/146] Build against Project Reactor 2023.0.2 snapshots. See #2206 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e92ffd2c..f190c34c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.1 + 2023.0.2-SNAPSHOT 2.2.21 3.1.8 1.10.0 From d5951a1d1dee89a735c0eb47abca92d5b582c8f1 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 4 Jan 2024 09:21:21 +0100 Subject: [PATCH 025/146] Build against Micrometer 1.12.2 snapshots. See #2204 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f190c34c..194b1633 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,7 +119,7 @@ 1.9.21 1.7.3 1.4.13 - 1.12.1 + 1.12.2-SNAPSHOT 1.2.1 5.5.0 1.13.7 From 5595c6bf88fecb24b9161b95719642a279bc1c31 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 10 Jan 2024 10:15:48 +0100 Subject: [PATCH 026/146] Upgrade to Project Reactor 2023.0.2. Closes #2206 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 194b1633..7387cac4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.2-SNAPSHOT + 2023.0.2 2.2.21 3.1.8 1.10.0 From 0d9d60176cc0bd2eccbd611695a3227eb13663dc Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 10 Jan 2024 10:16:21 +0100 Subject: [PATCH 027/146] Upgrade to Micrometer 1.12.2 and Micrometer Tracing 1.2.2. Closes #2204 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7387cac4..e5d1c236 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.21 1.7.3 1.4.13 - 1.12.2-SNAPSHOT - 1.2.1 + 1.12.2 + 1.2.2 5.5.0 1.13.7 5.0.0 From e40bdcc44dd80a312937710e8d0092363f77bec4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 10 Jan 2024 10:16:43 +0100 Subject: [PATCH 028/146] Upgrade to Kotlin 1.9.22. Closes #2207 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e5d1c236..f9b92603 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -116,7 +116,7 @@ 4.13.2 5.10.1 - 1.9.21 + 1.9.22 1.7.3 1.4.13 1.12.2 From f3e49d2e44e9f4db3e96886c2dcf9a6b4d713568 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 11 Jan 2024 11:13:21 +0100 Subject: [PATCH 029/146] Upgrade to Spring Framework 6.1.3. Closes #2202 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f9b92603..8e79a18a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.3-SNAPSHOT + 6.1.3 src/main/antora/antora-playbook.yml 0.0.3 0.0.7 From 37145d0aa6c411d03f1d08c68544b7b39e1e5569 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Jan 2024 10:50:44 +0100 Subject: [PATCH 030/146] Prepare 3.2.2 (2023.1.2). See #2197 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8e79a18a..114fa685 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.1 - 2023.1.2-SNAPSHOT + 2023.1.2 @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.2-SNAPSHOT + 3.2.2 zip true @@ -1424,20 +1424,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From eebe10158f565a8394ceef3200aa647431f2f5ab Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Jan 2024 10:51:31 +0100 Subject: [PATCH 031/146] Release version 3.2.2 (2023.1.2). See #2197 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 114fa685..d7934295 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.2-SNAPSHOT + 3.2.2 ../pom.xml @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.2-SNAPSHOT + 3.2.2 zip true diff --git a/pom.xml b/pom.xml index eaf0288e..58399bbf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.2-SNAPSHOT + 3.2.2 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 616795ab..ca4b99dd 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.2-SNAPSHOT + 3.2.2 ../pom.xml From 2cc2b22c1aac4e7be3a112e80558fdfade2b2a0f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Jan 2024 10:54:31 +0100 Subject: [PATCH 032/146] Prepare next development iteration. See #2197 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index d7934295..8cd983c9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.2 + 3.2.3-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.2 + 3.2.3-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.2 + 3.2.3-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 58399bbf..a8f78ac6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.2 + 3.2.3-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index ca4b99dd..595e77c7 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.2 + 3.2.3-SNAPSHOT ../pom.xml From 93d5d4ccaa98e296b54b20fc2120ea6cda05cd10 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Jan 2024 10:54:33 +0100 Subject: [PATCH 033/146] After release cleanups. See #2197 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8cd983c9..55d87ece 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.1 - 2023.1.2 + 2023.1.3-SNAPSHOT @@ -1424,8 +1424,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 647cc148806095eb87384b5814596df0a6ecbf92 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 30 Jan 2024 09:45:23 +0100 Subject: [PATCH 034/146] Refine artifactory build number scheme. See #2176 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4b6415cd..12048bb8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -100,7 +100,7 @@ pipeline { "-Dartifactory.password=${ARTIFACTORY_PSW} " + "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " + "-Dartifactory.build-name=spring-data-build " + - "-Dartifactory.build-number=${BUILD_NUMBER} " + + "-Dartifactory.build-number=spring-data-build-commercial-3.1.x-build-${BUILD_NUMBER} " + "-Dmaven.test.skip=true clean deploy -B -U" } } From b08c98b876c0cdfb4d6088a343e1e3f98a3e8111 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 31 Jan 2024 15:07:12 +0100 Subject: [PATCH 035/146] Update artifactory build name. See #2176 --- Jenkinsfile | 2 +- parent/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 12048bb8..874736aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -100,7 +100,7 @@ pipeline { "-Dartifactory.password=${ARTIFACTORY_PSW} " + "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " + "-Dartifactory.build-name=spring-data-build " + - "-Dartifactory.build-number=spring-data-build-commercial-3.1.x-build-${BUILD_NUMBER} " + + "-Dartifactory.build-number=spring-data-build-${BRANCH_NAME}-build-${BUILD_NUMBER} " + "-Dmaven.test.skip=true clean deploy -B -U" } } diff --git a/parent/pom.xml b/parent/pom.xml index 55d87ece..ad73d531 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -648,7 +648,7 @@ - Spring Data Docs ${dist.id} ${project.version} + ${dist.id}-docs-${project.version} 1 @@ -850,7 +850,7 @@ - Spring Data Schema ${dist.id} ${project.version} + ${dist.id}-schema-${project.version} 1 From 9f545438d91de4496735e8b80f139f5dcabe8243 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 6 Feb 2024 11:00:17 +0100 Subject: [PATCH 036/146] Move GPG signing into release profile. Closes #2214 --- pom.xml | 51 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index a8f78ac6..acf01cd2 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,28 @@ release + + + org.apache.maven.plugins + maven-gpg-plugin + 3.0.1 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + --no-tty + + + + + @@ -184,30 +206,6 @@ - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.0.1 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - --no-tty - - - - - - @@ -228,11 +226,6 @@ - - org.apache.maven.plugins - maven-gpg-plugin - - org.sonatype.plugins nexus-staging-maven-plugin From 858303022069ff5974f8b51df138d4041cb29b2a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Feb 2024 16:28:55 +0100 Subject: [PATCH 037/146] Add build URL to docs and schema builds. See #2176 --- parent/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index ad73d531..a89441bc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -650,6 +650,7 @@ ${dist.id}-docs-${project.version} 1 + {{BUILD_URL}} {{artifactory.server}} @@ -852,6 +853,7 @@ ${dist.id}-schema-${project.version} 1 + {{BUILD_URL}} {{artifactory.server}} From 8bee692f0bcdd70ec98a31ccb46fc762831a7ac5 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 15 Feb 2024 08:25:38 +0100 Subject: [PATCH 038/146] Upgrade to Project Reactor 2023.0.3. Closes #2219 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a89441bc..a5dbfe4e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.2 + 2023.0.3 2.2.21 3.1.8 1.10.0 From fd919efe182bbb12eb37257e4d3f5a4edc7af89a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 15 Feb 2024 08:26:49 +0100 Subject: [PATCH 039/146] Upgrade to Micrometer 1.12.3. Closes #2217 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a5dbfe4e..2efd1a6a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.22 1.7.3 1.4.13 - 1.12.2 - 1.2.2 + 1.12.3 + 1.2.3 5.5.0 1.13.7 5.0.0 From 3e329881e7032bf1d7f819ec64d420d3368f7f54 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 15 Feb 2024 08:32:42 +0100 Subject: [PATCH 040/146] Upgrade to Testcontainers 1.19.5. See #2225 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2efd1a6a..6588c70e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + 2023.1.3-SNAPSHOT From 1921a61109a5d5885095ff80c4efacbcf520367e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 15 Feb 2024 08:32:43 +0100 Subject: [PATCH 043/146] Upgrade to JUnit 5.10.2. See #2224 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6ec0aae7..17229891 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -114,7 +114,7 @@ 2.6.0 4.13.2 - 5.10.1 + 5.10.2 1.9.22 1.7.3 1.4.13 From 3747d05d3a74c8db2d05085212ecb624172dc374 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 15 Feb 2024 14:22:08 +0100 Subject: [PATCH 044/146] Upgrade to Spring Framework 6.1.4. Closes #2216 --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 17229891..0183a827 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.3 + 6.1.4 src/main/antora/antora-playbook.yml 0.0.3 0.0.7 @@ -875,7 +875,7 @@ spring6-next - 6.1.2-SNAPSHOT + 6.1.5-SNAPSHOT @@ -1441,4 +1441,4 @@ - \ No newline at end of file + From 410c1d7eefc8416c21d942c3f7dc54ab11094f7a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 Feb 2024 13:50:00 +0100 Subject: [PATCH 045/146] Prepare 3.2.3 (2023.1.3). See #2210 --- parent/pom.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0183a827..2b16738c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2023.1.3-SNAPSHOT + 2023.1.3 @@ -396,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.3-SNAPSHOT + 3.2.3 zip true @@ -1425,20 +1426,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 9fd8f0b3b71ea6f9bac50969f6053eb7cc08829b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 Feb 2024 13:50:29 +0100 Subject: [PATCH 046/146] Release version 3.2.3 (2023.1.3). See #2210 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2b16738c..d7fe0f0e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.3-SNAPSHOT + 3.2.3 ../pom.xml @@ -691,7 +691,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.3-SNAPSHOT + 3.2.3 zip true diff --git a/pom.xml b/pom.xml index acf01cd2..65ed2cb1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.3-SNAPSHOT + 3.2.3 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 595e77c7..fc4b2fea 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.3-SNAPSHOT + 3.2.3 ../pom.xml From aae9ddc7868bba3328b17adad01dbaf49cb6a073 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 Feb 2024 13:53:50 +0100 Subject: [PATCH 047/146] Prepare next development iteration. See #2210 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index d7fe0f0e..b39bc7ec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.3 + 3.2.4-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.3 + 3.2.4-SNAPSHOT zip true @@ -691,7 +691,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.3 + 3.2.4-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 65ed2cb1..520caeb4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.3 + 3.2.4-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index fc4b2fea..5bc93570 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.3 + 3.2.4-SNAPSHOT ../pom.xml From 6d956a2d40d3b453265a176f9f8c35e37a93477c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 Feb 2024 13:53:52 +0100 Subject: [PATCH 048/146] After release cleanups. See #2210 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b39bc7ec..cf57bd0e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2023.1.3 + 2023.1.4-SNAPSHOT @@ -1426,8 +1426,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 7a36c0661de2d78aec45339b2502a7e251bd8cf0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 Feb 2024 09:21:27 +0100 Subject: [PATCH 049/146] Remove Javadoc links to Spring Framework. Spring Framework uses Java 17 to generate Javadoc which no longer produces a package-list. See #2209 --- parent/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index cf57bd0e..b0e12d2c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1392,8 +1392,6 @@ true html,reference - https://docs.spring.io/spring/docs/${spring}/javadoc-api/ - https://docs.spring.io/spring-data/commons/docs/current/api/ https://docs.oracle.com/en/java/javase/17/docs/api/ From 74a7a69e2bcf4a4129d6ff9aa70bb7d325a9fe2a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 19 Feb 2024 08:46:33 +0100 Subject: [PATCH 050/146] Revise Javadoc config. Remove version-pinning to Java 1.8. Reinstate Framework and other dependency links. Closes #2236 --- parent/pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b0e12d2c..1f0536a2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -617,7 +617,6 @@ ${shared.resources}/assemblies/docs.xml - ${dist.id} true @@ -1387,11 +1386,14 @@
${project.name}
${source.level} true - 1.8 true html,reference + https://docs.spring.io/spring/docs/${spring}/javadoc-api/ + https://docs.spring.io/spring-data/commons/docs/current/api/ + https://docs.spring.io/spring-data/keyvalue/docs/current/api/ + https://docs.spring.io/spring-hateoas/docs/current/api/ https://docs.oracle.com/en/java/javase/17/docs/api/ From 6ac99561e9a0c2bafbf05dde814d03b459a7a2ba Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 20 Feb 2024 08:50:52 +0100 Subject: [PATCH 051/146] Upgrade build plugin versions. Closes #2240 --- parent/pom.xml | 49 +++++++++++++------------------------------------ pom.xml | 6 +++--- 2 files changed, 16 insertions(+), 39 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1f0536a2..83671c03 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1068,29 +1068,6 @@ - - org.asciidoctor - asciidoctor-maven-plugin - 2.2.3 - - - org.jruby - jruby - 9.3.7.0 - - - org.asciidoctor - asciidoctorj - 2.5.7 - - - io.spring.asciidoctor.backends - spring-asciidoctor-backends - ${spring-asciidoctor-backends.version} - - - - io.spring.maven.antora antora-maven-plugin @@ -1112,13 +1089,13 @@ org.apache.maven.plugins maven-assembly-plugin - 3.5.0 + 3.6.0 org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 true true @@ -1128,7 +1105,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.1 + 3.3.1 com.puppycrawl.tools @@ -1146,7 +1123,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.6.1 @@ -1158,13 +1135,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 false @@ -1185,19 +1162,19 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.6.3 org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 false @@ -1206,19 +1183,19 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.5.0 org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.1.1 org.jfrog.buildinfo artifactory-maven-plugin - 3.6.1 + 3.6.2 @@ -1411,7 +1388,7 @@ - 3.5.0 + 3.9.0 17 diff --git a/pom.xml b/pom.xml index 520caeb4..8a176970 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts @@ -105,7 +105,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 enforce-release-rules @@ -154,7 +154,7 @@ org.jfrog.buildinfo artifactory-maven-plugin - 3.6.1 + 3.6.2 build-info From 59ce275ec38b73be886e1c4237833ca1fc6a898f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 8 Mar 2024 09:55:56 +0100 Subject: [PATCH 052/146] Upgrade to Kotlin 1.9.23. See #2249 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 83671c03..26f4da47 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + 4.13.2 5.10.2 - 1.9.22 + 1.9.23 1.7.3 1.4.13 1.12.3 @@ -1419,4 +1418,4 @@ - + \ No newline at end of file From 3c7732bafa7b063261607d9dbc19fdcdea76621e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 8 Mar 2024 09:55:56 +0100 Subject: [PATCH 053/146] Upgrade to Testcontainers 1.19.7. See #2250 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 26f4da47..1d24afc6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -135,7 +135,7 @@ 2.2.0 3.0.0 6.0.0 - 1.19.5 + 1.19.7 3.0.2 0.10.4 4.0.2 From b98df5ba5ec718568b3176d0cf6a9d77b4c9e278 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 8 Mar 2024 09:55:56 +0100 Subject: [PATCH 054/146] Upgrade to Jacoco 0.8.11. See #2248 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1d24afc6..8d862433 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -108,7 +108,7 @@ 2.15.3 2.0.0 3.0.1 - 0.8.10 + 0.8.11 1.9.0 0.17.0 2.6.0 From 0ecd967d9104155ef7df7aefde1fea47a728d911 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 8 Mar 2024 09:55:56 +0100 Subject: [PATCH 055/146] Upgrade to Jackson 2.15.4. See #2247 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8d862433..2075e7be 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -105,7 +105,7 @@ 11.0.0 31.1-jre 1.3 - 2.15.3 + 2.15.4 2.0.0 3.0.1 0.8.11 From ecea87cb564938f64dda3c691b7e6cd153a5c47e Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 14 Mar 2024 09:37:53 +0100 Subject: [PATCH 056/146] Upgrade to Micrometer 1.12.4. Fixes GH-2243. --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2075e7be..756c35ad 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,8 +118,8 @@ 1.9.23 1.7.3 1.4.13 - 1.12.3 - 1.2.3 + 1.12.4 + 1.2.4 5.5.0 1.13.7 5.0.0 From aa6b1b2763337467a6bc0f7cbd709835f4181df2 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 14 Mar 2024 09:40:08 +0100 Subject: [PATCH 057/146] Upgrade to Reactor 2023.0.4. Fixes GH-2246. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 756c35ad..fb002205 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -123,7 +123,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.3 + 2023.0.4 2.2.21 3.1.8 1.10.0 From 9ce5b69abe1f5305d57d161169acfd2219060b0e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Mar 2024 11:55:29 +0100 Subject: [PATCH 058/146] Upgrade to Spring Framework 6.1.5. Closes #2242 --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index fb002205..7fc2e19b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.4 + 6.1.5 src/main/antora/antora-playbook.yml 0.0.3 0.0.7 @@ -874,7 +874,7 @@ spring6-next - 6.1.5-SNAPSHOT + 6.1.6-SNAPSHOT @@ -1418,4 +1418,4 @@ - \ No newline at end of file + From 01b1089ef94bc0765c312e14eef8181947acadc6 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 14 Mar 2024 12:29:58 +0100 Subject: [PATCH 059/146] Upgrade to Spring HATEOAS 2.2.1. Fixes GH-2258. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7fc2e19b..2db6ad9a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -132,7 +132,7 @@ src/main/antora/antora-playbook.yml 0.0.3 0.0.7 - 2.2.0 + 2.2.1 3.0.0 6.0.0 1.19.7 From 8549cccfda1679a78d80e05faa12c03b408e01b6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Mar 2024 10:17:29 +0100 Subject: [PATCH 060/146] Prepare 3.2.4 (2023.1.4). See #2238 --- parent/pom.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2db6ad9a..c2bed887 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2023.1.4-SNAPSHOT + 2023.1.4 @@ -396,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.4-SNAPSHOT + 3.2.4 zip true @@ -1402,20 +1403,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 2f3b5a7fcd41bd627b29491ce3797f47d3e87c41 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Mar 2024 10:17:48 +0100 Subject: [PATCH 061/146] Release version 3.2.4 (2023.1.4). See #2238 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c2bed887..4916fef0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.4-SNAPSHOT + 3.2.4 ../pom.xml @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.4-SNAPSHOT + 3.2.4 zip true diff --git a/pom.xml b/pom.xml index 8a176970..52899e93 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.4-SNAPSHOT + 3.2.4 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 5bc93570..f46fd6e9 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.4-SNAPSHOT + 3.2.4 ../pom.xml From 987df432f73f57426ca64ad4ea633e852343489a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Mar 2024 10:20:08 +0100 Subject: [PATCH 062/146] Prepare next development iteration. See #2238 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4916fef0..7add7512 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.4 + 3.2.5-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.4 + 3.2.5-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.4 + 3.2.5-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 52899e93..fb432871 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.4 + 3.2.5-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index f46fd6e9..54a66cc7 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.4 + 3.2.5-SNAPSHOT ../pom.xml From 0e8787f6f7ffbf5fa262d4653cc0e0a277adcce7 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Mar 2024 10:20:09 +0100 Subject: [PATCH 063/146] After release cleanups. See #2238 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7add7512..bf7465ed 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2023.1.4 + 2023.1.5-SNAPSHOT @@ -1403,8 +1403,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 050222c9cc4813991db351901c2d69978b209cdc Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 10 Apr 2024 10:52:06 +0200 Subject: [PATCH 064/146] Upgrade to Micrometer 1.12.5. Closes #2269 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index bf7465ed..ea913247 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.23 1.7.3 1.4.13 - 1.12.4 - 1.2.4 + 1.12.5 + 1.2.5 5.5.0 1.13.7 5.0.0 From ec70b494df5d837a6e5ad6240089253da581aee2 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 10 Apr 2024 10:52:23 +0200 Subject: [PATCH 065/146] Upgrade to Reactor 2023.0.5. Closes #2266 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index ea913247..8a1449bf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.4 + 2023.0.5 2.2.21 3.1.8 1.10.0 From a03899fd115edac96322a4cfaf6c869c321c78da Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 11 Apr 2024 11:05:21 +0200 Subject: [PATCH 066/146] Upgrade to Spring Framework 6.1.6. Closes #2265 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8a1449bf..7504e648 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.5 + 6.1.6 src/main/antora/antora-playbook.yml 0.0.3 0.0.7 From bda8d1b2101709f37a7b317508c33ecc11e8bae6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Apr 2024 09:18:16 +0200 Subject: [PATCH 067/146] Upgrade to Spring HATEOAS 2.2.2. Closes #2272 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7504e648..b3e80a79 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -133,7 +133,7 @@ src/main/antora/antora-playbook.yml 0.0.3 0.0.7 - 2.2.1 + 2.2.2 3.0.0 6.0.0 1.19.7 From 1c0805326baf9a805f6b0deab16d721592c1598e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Apr 2024 10:14:55 +0200 Subject: [PATCH 068/146] Prepare 3.2.5 (2023.1.5). See #2261 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b3e80a79..4feac96b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2023.1.5-SNAPSHOT + 2023.1.5 @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.5-SNAPSHOT + 3.2.5 zip true @@ -1403,20 +1403,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 6f0c62c9a261a480ac2c2059ac25410527650793 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Apr 2024 10:15:10 +0200 Subject: [PATCH 069/146] Release version 3.2.5 (2023.1.5). See #2261 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4feac96b..5043e51b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.5-SNAPSHOT + 3.2.5 ../pom.xml @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.5-SNAPSHOT + 3.2.5 zip true diff --git a/pom.xml b/pom.xml index fb432871..cda59e85 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.5-SNAPSHOT + 3.2.5 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 54a66cc7..6c052fe7 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.5-SNAPSHOT + 3.2.5 ../pom.xml From 3771ccb3334fefbfc61552a3d4cd9833cf9272be Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Apr 2024 10:17:27 +0200 Subject: [PATCH 070/146] Prepare next development iteration. See #2261 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5043e51b..48896d58 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.5 + 3.2.6-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.5 + 3.2.6-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.5 + 3.2.6-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index cda59e85..fa226d7d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.5 + 3.2.6-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 6c052fe7..f10de8e4 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.5 + 3.2.6-SNAPSHOT ../pom.xml From e721f6303a6238372fd8bb5c46f6a1f5673f4e5c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Apr 2024 10:17:28 +0200 Subject: [PATCH 071/146] After release cleanups. See #2261 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 48896d58..08f3196f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2023.1.5 + 2023.1.6-SNAPSHOT @@ -1403,8 +1403,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From f027ae2b3ce4540b0783ba76c6994bbabb3c2aa7 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 6 May 2024 09:43:04 +0200 Subject: [PATCH 072/146] Upgrade to AspectJ 1.9.22. See #2281 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 08f3196f..b5be0869 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + 4.13.2 5.10.2 - 1.9.23 + 1.9.24 1.7.3 1.4.13 1.12.5 From 55a704a5ce3aca6826c086b2bbeb2912760ef474 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 13 May 2024 09:17:28 +0200 Subject: [PATCH 075/146] Upgrade to Testcontainers 1.19.8. See #2291 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d89ee800..f0c688ce 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -135,7 +135,7 @@ 2.2.2 3.0.0 6.0.0 - 1.19.7 + 1.19.8 3.0.2 0.10.4 4.0.2 From 7b52951b21d7779d94b77c8815b032458e37c4d5 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 13 May 2024 09:17:28 +0200 Subject: [PATCH 076/146] Upgrade to AspectJ 1.9.22.1. See #2289 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f0c688ce..0699c810 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -98,7 +98,7 @@ 1.1.3 1.0.0 - 1.9.22 + 1.9.22.1 3.24.2 4.0.1 2.5 From e39711ce510ad7962d54f5be1f43ae5a819e098a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 13 May 2024 15:19:15 +0200 Subject: [PATCH 077/146] Build against Spring Framework 6.1.7 snapshots. See #2297 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0699c810..4e057b6e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.6 + 6.1.7-SNAPSHOT src/main/antora/antora-playbook.yml 0.0.3 0.0.7 @@ -1418,4 +1418,4 @@ - \ No newline at end of file + From 3ace356334afa96168b4d2b694b623190d9d6ae9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 13 May 2024 15:19:56 +0200 Subject: [PATCH 078/146] Build against Project Reactor 2023.0.6 snapshots. See #2299 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4e057b6e..9f56196a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -123,7 +123,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.5 + 2023.0.6-SNAPSHOT 2.2.21 3.1.8 1.10.0 From c977e7e634ebe0275b6fd2566101a4cb26ab6912 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 13 May 2024 15:20:41 +0200 Subject: [PATCH 079/146] Upgrade to Micrometer 1.12.6. Closes #2300 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9f56196a..2aaa602b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,8 +118,8 @@ 1.9.24 1.7.3 1.4.13 - 1.12.5 - 1.2.5 + 1.12.6 + 1.2.6 5.5.0 1.13.7 5.0.0 From c6720d79e113d3a8aade12190ced20c49a221c8e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 15 May 2024 08:39:03 +0200 Subject: [PATCH 080/146] Upgrade to Project Reactor 2023.0.6. Closes #2299 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2aaa602b..df72c174 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -123,7 +123,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.6-SNAPSHOT + 2023.0.6 2.2.21 3.1.8 1.10.0 From 7c2f06a5a75c381eeec8d1bfc88a8676a1fcccf8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 16 May 2024 14:18:42 +0200 Subject: [PATCH 081/146] Upgrade to Spring Framework 6.1.7. Closes #2297 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index df72c174..78732c25 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.7-SNAPSHOT + 6.1.7 src/main/antora/antora-playbook.yml 0.0.3 0.0.7 @@ -874,7 +874,7 @@ spring6-next - 6.1.6-SNAPSHOT + 6.1.8-SNAPSHOT From 8887d923932b07025e41cba9ac56f0c2d48f0c77 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 May 2024 11:21:59 +0200 Subject: [PATCH 082/146] Prepare 3.2.6 (2023.1.6). See #2275 --- parent/pom.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 78732c25..fd034b85 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2023.1.6-SNAPSHOT + 2023.1.6 @@ -396,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.6-SNAPSHOT + 3.2.6 zip true @@ -1402,20 +1403,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From b0aad6c4cbae2abe5a95cb5f7c751490fcf87cc8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 May 2024 11:22:23 +0200 Subject: [PATCH 083/146] Release version 3.2.6 (2023.1.6). See #2275 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index fd034b85..42edb3f0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.6-SNAPSHOT + 3.2.6 ../pom.xml @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.6-SNAPSHOT + 3.2.6 zip true diff --git a/pom.xml b/pom.xml index fa226d7d..43e2b816 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.6-SNAPSHOT + 3.2.6 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index f10de8e4..95f7d863 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.6-SNAPSHOT + 3.2.6 ../pom.xml From 9c5e60eff5236beeb64d9b0c20336a88a4253539 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 May 2024 11:24:36 +0200 Subject: [PATCH 084/146] Prepare next development iteration. See #2275 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 42edb3f0..30d4b0a5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.6 + 3.2.7-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.6 + 3.2.7-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.6 + 3.2.7-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 43e2b816..3046f5ab 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.6 + 3.2.7-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 95f7d863..79ff44dc 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.6 + 3.2.7-SNAPSHOT ../pom.xml From 005819e9bb08d7553a1f94b3bc5e8171850d8a01 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 May 2024 11:24:37 +0200 Subject: [PATCH 085/146] After release cleanups. See #2275 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 30d4b0a5..b849a356 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2023.1.6 + 2023.1.7-SNAPSHOT @@ -1403,8 +1403,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 8125a0855c492037c81c49d04d0bac51ac7097dd Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 11 Jun 2024 14:53:08 +0200 Subject: [PATCH 086/146] Upgrade to Micrometer 1.12.7. Closes #2308 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b849a356..6875bc5d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.24 1.7.3 1.4.13 - 1.12.6 - 1.2.6 + 1.12.7 + 1.2.7 5.5.0 1.13.7 5.0.0 From 3c8aa00992bbca7087ade1d370808b2dcb029b8a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 11 Jun 2024 14:53:17 +0200 Subject: [PATCH 087/146] Upgrade to Project Reactor 2023.0.7. Closes #2307 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6875bc5d..ac2954c6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.5.0 1.13.7 5.0.0 - 2023.0.6 + 2023.0.7 2.2.21 3.1.8 1.10.0 From 69b28653020d4bbfd74cdb61e875f6a7cacd446f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Jun 2024 14:04:04 +0200 Subject: [PATCH 088/146] Upgrade to Spring Framework 6.1.9. Closes #2306 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ac2954c6..c925258b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.7 + 6.1.9 src/main/antora/antora-playbook.yml 0.0.3 0.0.7 @@ -875,7 +875,7 @@ spring6-next - 6.1.8-SNAPSHOT + 6.1.10-SNAPSHOT From 69385d6d5eaff0312be2aea5889eaa38079603fd Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:04:05 +0200 Subject: [PATCH 089/146] Prepare 3.2.7 (2023.1.7). See #2303 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c925258b..7b4f52e2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2023.1.7-SNAPSHOT + 2023.1.7 @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.7-SNAPSHOT + 3.2.7 zip true @@ -1403,20 +1403,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From ff2a9b562afd2bfa365f5e27a827e4cc55cc5255 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:04:21 +0200 Subject: [PATCH 090/146] Release version 3.2.7 (2023.1.7). See #2303 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7b4f52e2..49dde979 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.7-SNAPSHOT + 3.2.7 ../pom.xml @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.7-SNAPSHOT + 3.2.7 zip true diff --git a/pom.xml b/pom.xml index 3046f5ab..506f7ae0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.7-SNAPSHOT + 3.2.7 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 79ff44dc..90759b58 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.7-SNAPSHOT + 3.2.7 ../pom.xml From 8e7fe076fcc4b256bc40c8d731ebba1e90b6c5d3 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:06:42 +0200 Subject: [PATCH 091/146] Prepare next development iteration. See #2303 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 49dde979..9b5801c7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.7 + 3.2.8-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.7 + 3.2.8-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.7 + 3.2.8-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 506f7ae0..269ab934 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.7 + 3.2.8-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 90759b58..20818c4a 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.7 + 3.2.8-SNAPSHOT ../pom.xml From e27f5dc09ecb6f93ea36e57304681fa66cd03bb8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:06:43 +0200 Subject: [PATCH 092/146] After release cleanups. See #2303 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9b5801c7..35f2e535 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2023.1.7 + 2023.1.8-SNAPSHOT @@ -1403,8 +1403,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 6ef1ddbe96a3e4cc7290eec499c93dd586b26a4e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 20 Jun 2024 09:10:52 +0200 Subject: [PATCH 093/146] Switch from `harbor-repo.vmware.com` to `packages.broadcom.com`. Closes #2263 --- Jenkinsfile | 56 +++++++++++++++++++++++------------------- ci/pipeline.properties | 6 +++-- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 874736aa..048e7220 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,12 +30,14 @@ pipeline { } steps { script { - docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { - sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + - "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + - "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + - "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + - "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" + docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { + docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { + sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + + "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + + "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + + "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + + "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" + } } } } @@ -62,12 +64,14 @@ pipeline { } steps { script { - docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) { - sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + - "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + - "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + - "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + - "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" + docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { + docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) { + sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + + "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + + "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + + "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + + "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" + } } } } @@ -89,19 +93,21 @@ pipeline { steps { script { - docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { - sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + - "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + - "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + - "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + - "./mvnw -s settings.xml -Pci,artifactory " + - "-Dartifactory.server=${p['artifactory.url']} " + - "-Dartifactory.username=${ARTIFACTORY_USR} " + - "-Dartifactory.password=${ARTIFACTORY_PSW} " + - "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " + - "-Dartifactory.build-name=spring-data-build " + - "-Dartifactory.build-number=spring-data-build-${BRANCH_NAME}-build-${BUILD_NUMBER} " + - "-Dmaven.test.skip=true clean deploy -B -U" + docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { + docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { + sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + + "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + + "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + + "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + + "./mvnw -s settings.xml -Pci,artifactory " + + "-Dartifactory.server=${p['artifactory.url']} " + + "-Dartifactory.username=${ARTIFACTORY_USR} " + + "-Dartifactory.password=${ARTIFACTORY_PSW} " + + "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " + + "-Dartifactory.build-name=spring-data-build " + + "-Dartifactory.build-number=spring-data-build-${BRANCH_NAME}-build-${BUILD_NUMBER} " + + "-Dmaven.test.skip=true clean deploy -B -U" + } } } } diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 60057f26..08f53f91 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -3,8 +3,8 @@ java.main.tag=17.0.9_9-jdk-focal java.next.tag=21.0.1_12-jdk-jammy # Docker container images - standard -docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag} -docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag} +docker.java.main.image=library/eclipse-temurin:${java.main.tag} +docker.java.next.image=library/eclipse-temurin:${java.next.tag} # Supported versions of MongoDB docker.mongodb.4.4.version=4.4.25 @@ -25,6 +25,8 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock - # Credentials docker.registry= docker.credentials=hub.docker.com-springbuildmaster +docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com +docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c artifactory.url=https://repo.spring.io artifactory.repository.snapshot=libs-snapshot-local From bd96a5db0df75b65fdcd3b0882620fc27a4c9fea Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 20 Jun 2024 09:23:07 +0200 Subject: [PATCH 094/146] Remove Slack hook. See #2263 --- Jenkinsfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 048e7220..2012326a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -117,10 +117,6 @@ pipeline { post { changed { script { - slackSend( - color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger', - channel: '#spring-data-dev', - message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}") emailext( subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}", mimeType: 'text/html', From 471a41134558ff43f75bd54fccc08befcd53b18d Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 8 Jul 2024 13:44:07 +0200 Subject: [PATCH 095/146] Upgrade to Micrometer 1.12.8. See #2314 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 35f2e535..8f785364 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + 4.13.2 - 5.10.2 + 5.10.3 1.9.24 1.7.3 1.4.13 From 43046d00c2969e4c8b35e797ced59b25a53e24ad Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Fri, 12 Jul 2024 11:16:54 +0200 Subject: [PATCH 099/146] Upgrade to jMolecules Integrations 0.21.0. Fixes GH-2324. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3683a99f..dd57761d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -110,7 +110,7 @@ 3.0.1 0.8.12 1.9.0 - 0.17.0 + 0.21.0 2.6.0 4.13.2 From f0fd8bdf8e2b76b1f52a111f4323489eeffd9508 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Fri, 12 Jul 2024 13:06:07 +0200 Subject: [PATCH 100/146] Upgrade to Spring HATEOAS 2.2.3. Fixes GH-2327. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index dd57761d..0849cba4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -132,7 +132,7 @@ src/main/antora/antora-playbook.yml 0.0.3 0.0.7 - 2.2.2 + 2.2.3 3.0.0 6.0.0 1.19.8 From f5fdaf5cf8020c31d69e2db37e53ad8759b2dc9d Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 13:32:44 +0200 Subject: [PATCH 101/146] Prepare 3.2.8 (2023.1.8). See #2311 --- parent/pom.xml | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0849cba4..adfc9a73 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2023.1.8-SNAPSHOT + 2023.1.8 @@ -396,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.8-SNAPSHOT + 3.2.8 zip true @@ -1402,20 +1403,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + - \ No newline at end of file + From 68fec488a4d5246886c5d5e1ab5cd0b17613acbb Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 13:33:05 +0200 Subject: [PATCH 102/146] Release version 3.2.8 (2023.1.8). See #2311 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index adfc9a73..2a42b9dc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.8-SNAPSHOT + 3.2.8 ../pom.xml @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.8-SNAPSHOT + 3.2.8 zip true diff --git a/pom.xml b/pom.xml index 269ab934..1c511b0c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.8-SNAPSHOT + 3.2.8 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 20818c4a..584fd998 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.8-SNAPSHOT + 3.2.8 ../pom.xml From 7228ec0484bd9b8045258482a714949f91508391 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 13:36:33 +0200 Subject: [PATCH 103/146] Prepare next development iteration. See #2311 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2a42b9dc..8a636895 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.8 + 3.2.9-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.8 + 3.2.9-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.8 + 3.2.9-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 1c511b0c..7a7c347d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.8 + 3.2.9-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 584fd998..1cdcf526 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.8 + 3.2.9-SNAPSHOT ../pom.xml From 005914d7a9a2ef8670b4d210cfc41c62a9713af0 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 13:36:34 +0200 Subject: [PATCH 104/146] After release cleanups. See #2311 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8a636895..f4c9ea49 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2023.1.8 + 2023.1.9-SNAPSHOT @@ -1403,8 +1403,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 7c2478ca5183c4dc83b4b07ae86f102d1188d32e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 30 Jul 2024 15:32:14 +0200 Subject: [PATCH 105/146] Add dependency management for Antora Maven Plugin. Closes #2331 --- parent/pom.xml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index f4c9ea49..96af4c7e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -132,6 +132,7 @@ 6.1.9 src/main/antora/antora-playbook.yml 0.0.3 + 1.0.0-alpha.4 0.0.7 2.2.3 3.0.0 @@ -371,6 +372,22 @@ + + org.antora + antora-maven-plugin + true + + ${antora.playbook} + + + + + antora + + compile + + + @@ -497,6 +514,21 @@ + + copy-javadoc + package + + + + + + + + + run + + + rename-reference-docs prepare-package @@ -1074,6 +1106,12 @@ ${spring-antora} + + org.antora + antora-maven-plugin + ${maven-antora} + + io.spring.maven.antora antora-component-version-maven-plugin From cd916a71285645d60527e6d0ad02310a7edee354 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Mon, 5 Aug 2024 07:45:29 -0500 Subject: [PATCH 106/146] Migrate build to Spring Develocity Conventions extension. * Migrate build to Spring Develocity Conventions extension. * Adopt Develocity environment variables. Closes #2333 --- .gitignore | 2 +- .mvn/extensions.xml | 11 +++-------- .mvn/gradle-enterprise.xml | 31 ------------------------------- Jenkinsfile | 14 -------------- ci/pipeline.properties | 1 - 5 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 .mvn/gradle-enterprise.xml diff --git a/.gitignore b/.gitignore index 51c071aa..971143b4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ target .classpath .idea credentials.yml -.mvn/.gradle-enterprise +.mvn/.develocity diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index ebd76102..1e3bb355 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,13 +1,8 @@ - com.gradle - gradle-enterprise-maven-extension - 1.19.2 - - - com.gradle - common-custom-user-data-maven-extension - 1.12.4 + io.spring.develocity.conventions + develocity-conventions-maven-extension + 0.0.19 diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml deleted file mode 100644 index c2440631..00000000 --- a/.mvn/gradle-enterprise.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - https://ge.spring.io - - - false - true - true - - #{{'0.0.0.0'}} - - - - - true - - - - - ${env.DEVELOCITY_CACHE_USERNAME} - ${env.DEVELOCITY_CACHE_PASSWORD} - - - true - #{env['DEVELOCITY_CACHE_USERNAME'] != null and env['DEVELOCITY_CACHE_PASSWORD'] != null} - - - diff --git a/Jenkinsfile b/Jenkinsfile index 2012326a..d0d1c5d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,6 @@ pipeline { options { timeout(time: 30, unit: 'MINUTES') } environment { ARTIFACTORY = credentials("${p['artifactory.credentials']}") - DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}") DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}") } steps { @@ -33,9 +32,6 @@ pipeline { docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + - "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + - "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + - "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" } } @@ -59,7 +55,6 @@ pipeline { options { timeout(time: 30, unit: 'MINUTES') } environment { ARTIFACTORY = credentials("${p['artifactory.credentials']}") - DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}") DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}") } steps { @@ -67,9 +62,6 @@ pipeline { docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) { sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + - "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + - "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + - "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" } } @@ -84,21 +76,15 @@ pipeline { label 'data' } options { timeout(time: 20, unit: 'MINUTES') } - environment { ARTIFACTORY = credentials("${p['artifactory.credentials']}") - DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}") DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}") } - steps { script { docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + - "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " + - "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " + - "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " + "./mvnw -s settings.xml -Pci,artifactory " + "-Dartifactory.server=${p['artifactory.url']} " + "-Dartifactory.username=${ARTIFACTORY_USR} " + diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 08f53f91..5097f091 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -30,6 +30,5 @@ docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c artifactory.url=https://repo.spring.io artifactory.repository.snapshot=libs-snapshot-local -develocity.cache.credentials=gradle_enterprise_cache_user develocity.access-key=gradle_enterprise_secret_access_key jenkins.user.name=spring-builds+jenkins From 7f559d60d62da4b792981430cb1dccdd10329d21 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 09:59:13 +0200 Subject: [PATCH 107/146] Upgrade to Kotlin 1.9.25. See #2341 --- parent/pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 96af4c7e..399b50b1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + 4.13.2 5.10.3 - 1.9.24 + 1.9.25 1.7.3 1.4.13 1.12.8 @@ -520,7 +519,7 @@ - + @@ -1457,4 +1456,4 @@ - + \ No newline at end of file From 81ab1de1e6d80a5cd8fea3777ef36e291d10e99a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 09:59:13 +0200 Subject: [PATCH 108/146] Upgrade to Mockk 1.13.12. See #2342 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 399b50b1..3cd86a9b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -121,7 +121,7 @@ 1.12.8 1.2.8 5.5.0 - 1.13.11 + 1.13.12 5.0.0 2023.0.7 2.2.21 From db2e96b95f339191f0f6aa998a04b320b7a673f0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 10:08:40 +0200 Subject: [PATCH 109/146] Upgrade to JDK 17.0.12_7 and 22.0.2_9. Closes #2345 --- ci/pipeline.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 5097f091..0c276039 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,6 +1,6 @@ # Java versions -java.main.tag=17.0.9_9-jdk-focal -java.next.tag=21.0.1_12-jdk-jammy +java.main.tag=17.0.12_7-jdk-focal +java.next.tag=22.0.2_9-jdk-jammy # Docker container images - standard docker.java.main.image=library/eclipse-temurin:${java.main.tag} From 45f630079f00a1d01c29dfb321c244587cf87790 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 10:17:16 +0200 Subject: [PATCH 110/146] Upgrade to Maven Wrapper 3.9.8. See #2346 --- .mvn/wrapper/maven-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 4281eea4..a4bad913 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -#Thu Dec 14 08:34:04 CET 2023 -distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +#Thu Aug 08 10:17:16 CEST 2024 +distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip From fd3ca03f7ee594c083b9d5700f21c9a12d3906da Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 15:08:47 +0200 Subject: [PATCH 111/146] Upgrade to Mockito 5.12.0. Closes #2349 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3cd86a9b..1ef41fed 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,7 +120,7 @@ 1.4.13 1.12.8 1.2.8 - 5.5.0 + 5.12.0 1.13.12 5.0.0 2023.0.7 @@ -1456,4 +1456,4 @@ - \ No newline at end of file + From d3f15b031e0cd99a28cb8532febd83278a26d364 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 09:23:26 +0200 Subject: [PATCH 112/146] Upgrade to Reactor 2023.0.9. Closes #2338 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1ef41fed..d5d46d3c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -123,7 +123,7 @@ 5.12.0 1.13.12 5.0.0 - 2023.0.7 + 2023.0.9 2.2.21 3.1.8 1.10.0 From e9e581688a6bd55d53907d8dec92f1c661b93cd6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 09:23:44 +0200 Subject: [PATCH 113/146] Upgrade to Micrometer 1.12.9. Closes #2340 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index d5d46d3c..d6a8cab7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,8 +118,8 @@ 1.9.25 1.7.3 1.4.13 - 1.12.8 - 1.2.8 + 1.12.9 + 1.2.9 5.12.0 1.13.12 5.0.0 From c17457d65ac3ed096643dd1bd585fc9b445ef7da Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 13:56:28 +0200 Subject: [PATCH 114/146] Upgrade to Spring Framework 6.1.12. Closes #2335 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d6a8cab7..8fa5132a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.9 + 6.1.12 src/main/antora/antora-playbook.yml 0.0.3 1.0.0-alpha.4 From f5579767bd891c864d8fcdcac579765958cc12dc Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 14:46:59 +0200 Subject: [PATCH 115/146] Upgrade to RxJava 3.1.9. See #2350 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8fa5132a..a5234754 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.0.0 2023.0.9 2.2.21 - 3.1.8 + 3.1.9 1.10.0 2.0.2 6.1.12 @@ -1456,4 +1456,4 @@ - + \ No newline at end of file From 1cf288b24ee15d4b9be616aaf1d9dea49e4a49c5 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Wed, 14 Aug 2024 19:56:30 +0200 Subject: [PATCH 116/146] Upgrade to Spring HATEOAS 2.2.4. Fixes GH-2360. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a5234754..6520c6f8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -133,7 +133,7 @@ 0.0.3 1.0.0-alpha.4 0.0.7 - 2.2.3 + 2.2.4 3.0.0 6.0.0 1.19.8 From 42e0f3eb0920da98fd4c2f185b388916a5630e0a Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 16 Aug 2024 08:58:11 +0200 Subject: [PATCH 117/146] Prepare 3.2.9 (2023.1.9). See #2328 --- parent/pom.xml | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6520c6f8..c77aaeaa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2023.1.9-SNAPSHOT + 2023.1.9 @@ -413,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.9-SNAPSHOT + 3.2.9 zip true @@ -1440,20 +1441,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + - \ No newline at end of file + From bc419b3caf0c782758fe52c7263cc189091cfe13 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 16 Aug 2024 08:58:34 +0200 Subject: [PATCH 118/146] Release version 3.2.9 (2023.1.9). See #2328 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c77aaeaa..82960d5c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.9-SNAPSHOT + 3.2.9 ../pom.xml @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.9-SNAPSHOT + 3.2.9 zip true diff --git a/pom.xml b/pom.xml index 7a7c347d..42e7de9a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.9-SNAPSHOT + 3.2.9 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 1cdcf526..9e27dfd5 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.9-SNAPSHOT + 3.2.9 ../pom.xml From fda1c662bc342e8f22175d2fc6445777e6ebe784 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 16 Aug 2024 09:01:33 +0200 Subject: [PATCH 119/146] Prepare next development iteration. See #2328 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 82960d5c..ebf1e7d6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.9 + 3.2.10-SNAPSHOT ../pom.xml @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.9 + 3.2.10-SNAPSHOT zip true @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.9 + 3.2.10-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 42e7de9a..3a53cf9a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.9 + 3.2.10-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 9e27dfd5..751a1e1f 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.9 + 3.2.10-SNAPSHOT ../pom.xml From 38ae19c366a1c141507c48ad635c9838992cb42a Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 16 Aug 2024 09:01:34 +0200 Subject: [PATCH 120/146] After release cleanups. See #2328 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ebf1e7d6..35ff2e6f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2023.1.9 + 2023.1.10-SNAPSHOT @@ -1441,8 +1441,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 974452611cd05ca4893830130133da5fd12b9b1d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 10 Sep 2024 14:49:45 +0200 Subject: [PATCH 121/146] Upgrade to Reactor 2023.0.10. Closes #2371 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 35ff2e6f..e1f28809 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.12.0 1.13.12 5.0.0 - 2023.0.9 + 2023.0.10 2.2.21 3.1.9 1.10.0 From dfedee6093fcf393cd066c2bf6d5fa2d42fda081 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 10 Sep 2024 14:50:47 +0200 Subject: [PATCH 122/146] Upgrade to Micrometer 1.12.10. Closes #2372 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index e1f28809..855473cc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.25 1.7.3 1.4.13 - 1.12.9 - 1.2.9 + 1.12.10 + 1.2.10 5.12.0 1.13.12 5.0.0 From c2254a23ef376b8c15c5924ea7ec70f82d52669e Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 12 Sep 2024 15:08:20 +0200 Subject: [PATCH 123/146] Upgrade to Spring HATEOAS 2.2.5. Fixes GH-2378. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 855473cc..ea2975f7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -134,7 +134,7 @@ 0.0.3 1.0.0-alpha.4 0.0.7 - 2.2.4 + 2.2.5 3.0.0 6.0.0 1.19.8 From 0a2609851e9589086d6d6ef3843ed584e3a2389c Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 13 Sep 2024 10:49:50 +0200 Subject: [PATCH 124/146] Prepare 3.2.10 (2023.1.10). See #2361 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ea2975f7..20f5daad 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2023.1.10-SNAPSHOT + 2023.1.10 @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.10-SNAPSHOT + 3.2.10 zip true @@ -1441,20 +1441,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 5537603b0a0d9abfcbb70ce14a9a5c469bae9525 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 13 Sep 2024 10:50:08 +0200 Subject: [PATCH 125/146] Release version 3.2.10 (2023.1.10). See #2361 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 20f5daad..f8db5d10 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.10-SNAPSHOT + 3.2.10 ../pom.xml @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.10-SNAPSHOT + 3.2.10 zip true diff --git a/pom.xml b/pom.xml index 3a53cf9a..68910502 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.10-SNAPSHOT + 3.2.10 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 751a1e1f..2f9d6f52 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.10-SNAPSHOT + 3.2.10 ../pom.xml From c8f4c09514550359e3db94fd31758027bfa4678c Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 13 Sep 2024 10:52:59 +0200 Subject: [PATCH 126/146] Prepare next development iteration. See #2361 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f8db5d10..77e4d190 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.10 + 3.2.11-SNAPSHOT ../pom.xml @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.10 + 3.2.11-SNAPSHOT zip true @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.10 + 3.2.11-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 68910502..78a76aaf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.10 + 3.2.11-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 2f9d6f52..1fb1fb29 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.10 + 3.2.11-SNAPSHOT ../pom.xml From 6b88ce910cd686a1726060c1ee05118038e06765 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 13 Sep 2024 10:53:00 +0200 Subject: [PATCH 127/146] After release cleanups. See #2361 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 77e4d190..7daa034f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2023.1.10 + 2023.1.11-SNAPSHOT @@ -1441,8 +1441,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 9aff0bcc35b8fb605ab6d4e96d8f0c30fe50edc8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 9 Oct 2024 14:03:03 +0200 Subject: [PATCH 128/146] Use Docker in Docker build setup. See #2381 --- Jenkinsfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d0d1c5d9..0c968e8c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,9 +30,9 @@ pipeline { steps { script { docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { - docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { + docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) { sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + - "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" + "./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-build clean dependency:list verify -Dsort -B" } } } @@ -60,9 +60,9 @@ pipeline { steps { script { docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { - docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) { + docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) { sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + - "./mvnw -s settings.xml clean dependency:list verify -Dsort -B" + "./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-build clean dependency:list verify -Dsort -B" } } } @@ -83,15 +83,17 @@ pipeline { steps { script { docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { - docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { + docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) { sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + "./mvnw -s settings.xml -Pci,artifactory " + + "-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " + "-Dartifactory.server=${p['artifactory.url']} " + "-Dartifactory.username=${ARTIFACTORY_USR} " + "-Dartifactory.password=${ARTIFACTORY_PSW} " + "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " + "-Dartifactory.build-name=spring-data-build " + "-Dartifactory.build-number=spring-data-build-${BRANCH_NAME}-build-${BUILD_NUMBER} " + + "-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-build " + "-Dmaven.test.skip=true clean deploy -B -U" } } From afece241c9c6d1d0a21a88730c0e11a31512739e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 10 Oct 2024 09:08:18 +0200 Subject: [PATCH 129/146] Upgrade to Mockk 1.13.13. See #2394 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7daa034f..c0c9ea0d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + 4.13.2 - 5.10.3 + 5.10.5 1.9.25 1.7.3 1.4.13 From 9bcb54a4f9f11ee4c11b2b28b60070ad845268d0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 16 Oct 2024 08:52:18 +0200 Subject: [PATCH 131/146] Upgrade to Project Reactor 2023.0.11. Closes #2398 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 34c9470d..87ccf22b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -123,7 +123,7 @@ 5.12.0 1.13.13 5.0.0 - 2023.0.10 + 2023.0.11 2.2.21 3.1.9 1.10.0 @@ -1456,4 +1456,4 @@ - \ No newline at end of file + From 710bc325cb3df3c74beeb5ee01d04b51cf41f176 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 16 Oct 2024 08:52:46 +0200 Subject: [PATCH 132/146] Upgrade to Micrometer 1.12.11. Closes #2401 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 87ccf22b..d41b5d2c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,8 +118,8 @@ 1.9.25 1.7.3 1.4.13 - 1.12.10 - 1.2.10 + 1.12.11 + 1.2.11 5.12.0 1.13.13 5.0.0 From 9f269a780bae8759031ac158f0a37191061b7a52 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 17 Oct 2024 10:55:49 +0200 Subject: [PATCH 133/146] Upgrade to Spring Framework 6.1.14. Closes #2399 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index d41b5d2c..8c94f11f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.9 1.10.0 2.0.2 - 6.1.12 + 6.1.14 src/main/antora/antora-playbook.yml 0.0.3 1.0.0-alpha.4 @@ -906,7 +906,7 @@ spring6-next - 6.1.10-SNAPSHOT + 6.1.15-SNAPSHOT From f77b2a2d6aef0383f84873a2417c6a5452ef0844 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Oct 2024 10:14:17 +0200 Subject: [PATCH 134/146] Prepare 3.2.11 (2023.1.11). See #2379 --- parent/pom.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8c94f11f..18b38c70 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2023.1.11-SNAPSHOT + 2023.1.11 @@ -413,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.11-SNAPSHOT + 3.2.11 zip true @@ -1440,20 +1441,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 7f0b2081b223027afb2a7f2285bd83a96de67eb0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Oct 2024 10:14:33 +0200 Subject: [PATCH 135/146] Release version 3.2.11 (2023.1.11). See #2379 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 18b38c70..ce811918 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.11-SNAPSHOT + 3.2.11 ../pom.xml @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.11-SNAPSHOT + 3.2.11 zip true diff --git a/pom.xml b/pom.xml index 78a76aaf..c498467b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.11-SNAPSHOT + 3.2.11 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 1fb1fb29..4df1c44e 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.11-SNAPSHOT + 3.2.11 ../pom.xml From cfc6ba6208b902f5a40af2ec9db0986591fab5e9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Oct 2024 10:17:01 +0200 Subject: [PATCH 136/146] Prepare next development iteration. See #2379 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ce811918..ee8987d9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.11 + 3.2.12-SNAPSHOT ../pom.xml @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.11 + 3.2.12-SNAPSHOT zip true @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.11 + 3.2.12-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index c498467b..3795f0d0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.11 + 3.2.12-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 4df1c44e..f35d8304 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.11 + 3.2.12-SNAPSHOT ../pom.xml From 4b9c58387a7eee1fa6a4d203b6c4b1cfc31be5ee Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Oct 2024 10:17:02 +0200 Subject: [PATCH 137/146] After release cleanups. See #2379 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ee8987d9..16b7bae6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2023.1.11 + 2023.1.12-SNAPSHOT @@ -1441,8 +1441,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 61d3f69408d3743b0dc70df49b91a8882a756f06 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 7 Nov 2024 09:50:55 +0100 Subject: [PATCH 138/146] Upgrade to Maven Wrapper 3.9.9. See #2411 --- .mvn/wrapper/maven-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index a4bad913..1ee347c8 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -#Thu Aug 08 10:17:16 CEST 2024 -distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip +#Thu Nov 07 09:50:55 CET 2024 +distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip From 9ddb5912f2d1b8ec066d37db67a63d9f2eb4bae3 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 7 Nov 2024 09:58:29 +0100 Subject: [PATCH 139/146] Upgrade JDK to 17.0.13. Closes #2413 --- ci/pipeline.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 0c276039..67dbefbb 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,5 +1,5 @@ # Java versions -java.main.tag=17.0.12_7-jdk-focal +java.main.tag=17.0.13_11-jdk-focal java.next.tag=22.0.2_9-jdk-jammy # Docker container images - standard From 6244e68e071a3f93c5670f51ce1f700c4be9bd89 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 13 Nov 2024 09:14:05 +0100 Subject: [PATCH 140/146] Upgrade to Micrometer 1.12.12. Closes #2422 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 16b7bae6..4190c18a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.25 1.7.3 1.4.13 - 1.12.11 - 1.2.11 + 1.12.12 + 1.2.12 5.12.0 1.13.13 5.0.0 From c163e83df88891fd8fc50f81018ecec1401e1619 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 13 Nov 2024 09:14:35 +0100 Subject: [PATCH 141/146] Upgrade to Project Reactor 2023.0.12. Closes #2420 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4190c18a..8543d02f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.12.0 1.13.13 5.0.0 - 2023.0.11 + 2023.0.12 2.2.21 3.1.9 1.10.0 From 8dacf70daa0b4855eba6bb36538ea51717fc0979 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Nov 2024 15:44:10 +0100 Subject: [PATCH 142/146] Upgrade to Spring Framework 6.1.15. Closes #2423 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8543d02f..89d5113b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.9 1.10.0 2.0.2 - 6.1.14 + 6.1.15 src/main/antora/antora-playbook.yml 0.0.3 1.0.0-alpha.4 @@ -907,7 +907,7 @@ spring6-next - 6.1.15-SNAPSHOT + 6.1.16-SNAPSHOT From 2ba354a99eff45bb6ae32aaf620e9e1efb15e740 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Nov 2024 10:21:21 +0100 Subject: [PATCH 143/146] Prepare 3.2.12 (2023.1.12). See #2404 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 89d5113b..066a1bcb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2023.1.12-SNAPSHOT + 2023.1.12 @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.12-SNAPSHOT + 3.2.12 zip true @@ -1441,20 +1441,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 2bc23380203c44fb8618c7ff249eb83168ee5e94 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Nov 2024 10:21:37 +0100 Subject: [PATCH 144/146] Release version 3.2.12 (2023.1.12). See #2404 --- parent/pom.xml | 4 ++-- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 066a1bcb..c065da7c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.12-SNAPSHOT + 3.2.12 ../pom.xml @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.12-SNAPSHOT + 3.2.12 zip true diff --git a/pom.xml b/pom.xml index 3795f0d0..95cd4e8c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.12-SNAPSHOT + 3.2.12 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index f35d8304..8bcf00da 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.12-SNAPSHOT + 3.2.12 ../pom.xml From a972d571a9354611f9c7b19c05606d515a160253 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Nov 2024 10:23:53 +0100 Subject: [PATCH 145/146] Prepare next development iteration. See #2404 --- parent/pom.xml | 6 +++--- pom.xml | 2 +- resources/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c065da7c..6efc99d3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.2.12 + 3.2.13-SNAPSHOT ../pom.xml @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.12 + 3.2.13-SNAPSHOT zip true @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.2.12 + 3.2.13-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 95cd4e8c..6ac12839 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.2.12 + 3.2.13-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 8bcf00da..68cd6d4a 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.2.12 + 3.2.13-SNAPSHOT ../pom.xml From e6b25390866ab2f98f48c632041a50233f2ffe67 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Nov 2024 10:23:54 +0100 Subject: [PATCH 146/146] After release cleanups. See #2404 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6efc99d3..790f90f8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2023.1.12 + 2023.1.13-SNAPSHOT @@ -1441,8 +1441,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone +