From 0aabfd9084fedbee2937a20a4740eaafbfe85739 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 May 2024 11:51:48 +0200 Subject: [PATCH 001/137] Prepare next development iteration. See #2276 --- 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 d288c1d5..02bd4f78 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.0 + 3.3.1-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.0 + 3.3.1-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.0 + 3.3.1-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index a73dbb72..952cac0a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.0 + 3.3.1-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index fa96bd6e..8d83bf5e 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.0 + 3.3.1-SNAPSHOT ../pom.xml From 6e1cee0ede03510e52ab4ff41d6c17ef0c19fc08 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 May 2024 11:51:49 +0200 Subject: [PATCH 002/137] After release cleanups. See #2276 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 02bd4f78..afbd82ff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2024.0.0 + 2024.0.1-SNAPSHOT @@ -1403,8 +1403,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 4304de8a9c1e65f64012dcd6450ec46dad3870d8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 10 Jun 2024 09:17:38 +0200 Subject: [PATCH 003/137] Build against Micrometer 1.13.1 snapshots. See #2309 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index afbd82ff..e0f2d3b3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.24 1.8.1 1.4.13 - 1.13.0 - 1.3.0 + 1.13.1-SNAPSHOT + 1.3.1-SNAPSHOT 5.11.0 1.13.10 5.1.0 From bc94e1d12fb3f4be4c3fec46563294c70d8869aa Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 10 Jun 2024 09:18:14 +0200 Subject: [PATCH 004/137] Build against Spring Framework 6.1.9 snapshots. See #2306 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e0f2d3b3..41da908e 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-SNAPSHOT src/main/antora/antora-playbook.yml 0.0.3 0.0.7 From 7bb65cb7092ae753a283ae3bc1428d98a055cdbf Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 11 Jun 2024 14:52:20 +0200 Subject: [PATCH 005/137] 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 41da908e..497dc50c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.11.0 1.13.10 5.1.0 - 2023.0.6 + 2023.0.7 2.2.21 3.1.8 1.10.0 From 805b2f3474f852b257db1241b0f8cbb4cdcffb80 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 11 Jun 2024 14:52:35 +0200 Subject: [PATCH 006/137] Upgrade to Micrometer 1.13.1. Closes #2309 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 497dc50c..e4856680 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.24 1.8.1 1.4.13 - 1.13.1-SNAPSHOT - 1.3.1-SNAPSHOT + 1.13.1 + 1.3.1 5.11.0 1.13.10 5.1.0 From 4d25501d5eb4f363b9ca7636cee37ce713832007 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Jun 2024 14:04:21 +0200 Subject: [PATCH 007/137] 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 e4856680..08b1ac27 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.9-SNAPSHOT + 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 d12f6e004cdf4ca9cf94e9d54d160a32a8594eec Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:45:23 +0200 Subject: [PATCH 008/137] Prepare 3.3.1 (2024.0.1). See #2304 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 08b1ac27..9ebcf74e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2024.0.1-SNAPSHOT + 2024.0.1 @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.1-SNAPSHOT + 3.3.1 zip true @@ -1403,20 +1403,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From ef4ed57419257157a47d382a8e2c3c83a9c07e58 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:45:40 +0200 Subject: [PATCH 009/137] Release version 3.3.1 (2024.0.1). See #2304 --- 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 9ebcf74e..57e23d17 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.1-SNAPSHOT + 3.3.1 ../pom.xml @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.1-SNAPSHOT + 3.3.1 zip true diff --git a/pom.xml b/pom.xml index 952cac0a..66954980 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.1-SNAPSHOT + 3.3.1 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 8d83bf5e..1c214316 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.1-SNAPSHOT + 3.3.1 ../pom.xml From 748de9f25f3c2b978bc4e8cce9e794e8089d845d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:47:58 +0200 Subject: [PATCH 010/137] Prepare next development iteration. See #2304 --- 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 57e23d17..63f509da 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.1 + 3.3.2-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.1 + 3.3.2-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.1 + 3.3.2-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 66954980..9bdcc948 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.1 + 3.3.2-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 1c214316..38a1ee54 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.1 + 3.3.2-SNAPSHOT ../pom.xml From 21da320402e2273c953c10b9c30a7e75cc996f4c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:47:59 +0200 Subject: [PATCH 011/137] After release cleanups. See #2304 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 63f509da..0d277e85 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2024.0.1 + 2024.0.2-SNAPSHOT @@ -1403,8 +1403,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 5d3f1504918a8c7640c75aa307b254ca612f8bf8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 20 Jun 2024 09:10:52 +0200 Subject: [PATCH 012/137] 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 6ff93899..824563a2 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 @@ -26,6 +26,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 743b4cd86330d5ccfc9b0c7c93c158086217e976 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 20 Jun 2024 09:23:07 +0200 Subject: [PATCH 013/137] 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 d9e3b892b09300911b18c2d1b56edc06de446ed8 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 8 Jul 2024 13:45:42 +0200 Subject: [PATCH 014/137] Upgrade to Mockk 1.13.11. See #2319 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0d277e85..56618660 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.8.1 1.4.13 From 7f8d4949cc69c09ece7b67e071baa9bce92977ae Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 8 Jul 2024 13:45:42 +0200 Subject: [PATCH 016/137] Upgrade to Jackson 2.17.2. See #2317 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 661745c9..785f5d60 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -105,7 +105,7 @@ 11.0.0 31.1-jre 1.3 - 2.17.1 + 2.17.2 2.0.0 3.0.1 0.8.12 From 48bd311eaf0d401bcab5f8bbeb387baa0ad19de7 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 09:25:31 +0200 Subject: [PATCH 017/137] Upgrade to Micrometer 1.13.2. See #2321 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 785f5d60..19bcaa8b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,7 +118,7 @@ 1.9.24 1.8.1 1.4.13 - 1.13.1 + 1.13.2 1.3.1 5.11.0 1.13.11 From eaf5b6fbde7bbce0da2bcefc8eec686ff979b8a5 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 09:25:31 +0200 Subject: [PATCH 018/137] Upgrade to Micrometer Tracing 1.3.2. See #2322 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 19bcaa8b..73384c27 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,7 +119,7 @@ 1.8.1 1.4.13 1.13.2 - 1.3.1 + 1.3.2 5.11.0 1.13.11 5.1.0 From 03b4ab1f87af3877a83225b2ab958c50bb82f73b Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Fri, 12 Jul 2024 11:16:54 +0200 Subject: [PATCH 019/137] Upgrade to jMolecules Integrations 0.21.0. Fixes GH-2323. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 73384c27..62ba2edb 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 3ce4bbe81000ca1ee011045742b28ad0dac9f685 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Fri, 12 Jul 2024 13:06:47 +0200 Subject: [PATCH 020/137] Upgrade to Spring HATEOAS 2.3.1. Fixes GH-2326. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 62ba2edb..c48ff80e 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.3.0 + 2.3.1 3.0.0 6.0.0 1.19.8 From 67227700050e63043ca7a2b8b9602c6a6b203721 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 19:09:00 +0200 Subject: [PATCH 021/137] Prepare 3.3.2 (2024.0.2). See #2312 --- parent/pom.xml | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c48ff80e..cdbdb713 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2024.0.2-SNAPSHOT + 2024.0.2 @@ -396,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.2-SNAPSHOT + 3.3.2 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 2e1559ca6ffba4238cd87cdb990a55b6d64c2005 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 19:09:19 +0200 Subject: [PATCH 022/137] Release version 3.3.2 (2024.0.2). See #2312 --- 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 cdbdb713..bc91f0ba 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.2-SNAPSHOT + 3.3.2 ../pom.xml @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.2-SNAPSHOT + 3.3.2 zip true diff --git a/pom.xml b/pom.xml index 9bdcc948..9f455e05 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.2-SNAPSHOT + 3.3.2 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 38a1ee54..a0e83112 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.2-SNAPSHOT + 3.3.2 ../pom.xml From a1bdc1d4953f30ec251ae52b6a80d7452a08e105 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 19:12:13 +0200 Subject: [PATCH 023/137] Prepare next development iteration. See #2312 --- 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 bc91f0ba..ed5cce23 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.2 + 3.3.3-SNAPSHOT ../pom.xml @@ -397,7 +397,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.2 + 3.3.3-SNAPSHOT zip true @@ -690,7 +690,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.2 + 3.3.3-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 9f455e05..82c079a3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.2 + 3.3.3-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index a0e83112..1e184f7e 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.2 + 3.3.3-SNAPSHOT ../pom.xml From 1fc673d1342cf00a83573f0561f7ace32342d574 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 19:12:14 +0200 Subject: [PATCH 024/137] After release cleanups. See #2312 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ed5cce23..c451608e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 4.0.2 - 2024.0.2 + 2024.0.3-SNAPSHOT @@ -1403,8 +1403,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From d2907e1e2987d87ac5963b7a5c6ff8b35db78765 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 30 Jul 2024 15:32:14 +0200 Subject: [PATCH 025/137] 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 c451608e..caf736dc 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.3.1 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 ea0a3b15c284188a1e898c78b9ec996591bbce81 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Mon, 5 Aug 2024 07:45:29 -0500 Subject: [PATCH 026/137] 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 824563a2..dea83572 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -31,6 +31,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 5fe042eea633e92c2546453041ea1c3f27297ce2 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 09:53:54 +0200 Subject: [PATCH 027/137] Build against Reactor 2023.0.9 snapshots. See #2338 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index caf736dc..55e445ae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.11.0 1.13.11 5.1.0 - 2023.0.7 + 2023.0.9-SNAPSHOT 2.2.21 3.1.8 1.10.0 From efb80d6d8030e501287424640813f9224f64ae23 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 09:54:24 +0200 Subject: [PATCH 028/137] Build against Spring Framework 6.1.12 snapshots. See #2335 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 55e445ae..dd312ea5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,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 fcfa22165024fa3be6c3f3ab758799c964e3e1d4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 10:01:19 +0200 Subject: [PATCH 029/137] Upgrade to Kotlin 1.9.25. See #2343 --- parent/pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index dd312ea5..b8743169 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.8.1 1.4.13 1.13.2 @@ -520,7 +519,7 @@ - + @@ -1457,4 +1456,4 @@ - + \ No newline at end of file From 04da7e3c0fb3c1d01dd9f62096e7b60de9352e98 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 10:01:20 +0200 Subject: [PATCH 030/137] Upgrade to Mockk 1.13.12. See #2344 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b8743169..f793b8fe 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -121,7 +121,7 @@ 1.13.2 1.3.2 5.11.0 - 1.13.11 + 1.13.12 5.1.0 2023.0.9-SNAPSHOT 2.2.21 From 8c1856d2690982fd7ad520ec6a35a5a0b941ff67 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 10:08:40 +0200 Subject: [PATCH 031/137] 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 dea83572..40bb3491 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 859b0c2ed33ea1ed0e5af562f2679ce19ae74238 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 10:09:51 +0200 Subject: [PATCH 032/137] Build against Spring Framework 6.1.12 snapshots. See #2335 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f793b8fe..817c2bad 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.12 + 6.1.12-SNAPSHOT src/main/antora/antora-playbook.yml 0.0.3 1.0.0-alpha.4 @@ -1456,4 +1456,4 @@ - \ No newline at end of file + From 8bb09488100cfc1f22f3f401bb9e0c6006fd2415 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 10:18:12 +0200 Subject: [PATCH 033/137] Upgrade to Maven Wrapper 3.9.8. See #2347 --- .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 3a8538ed..9375ebd1 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -#Thu Dec 14 08:40:34 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:18:12 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 b995098fa92825fd0c07e3bc8f13a652ce36edb8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 15:09:13 +0200 Subject: [PATCH 034/137] Upgrade to Mockito 5.12.0. Closes #2349 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 817c2bad..a1b75809 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,7 +120,7 @@ 1.4.13 1.13.2 1.3.2 - 5.11.0 + 5.12.0 1.13.12 5.1.0 2023.0.9-SNAPSHOT From 455dfb48501c8d33e4a2bb43812648814560e075 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 09:22:42 +0200 Subject: [PATCH 035/137] Upgrade to Micrometer 1.13.3. Closes #2339 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a1b75809..617b63e6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,8 +118,8 @@ 1.9.25 1.8.1 1.4.13 - 1.13.2 - 1.3.2 + 1.13.3 + 1.3.3 5.12.0 1.13.12 5.1.0 From 17e5b703108803db13a5dd467bab816c713309b4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 09:22:53 +0200 Subject: [PATCH 036/137] 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 617b63e6..4a49a177 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -123,7 +123,7 @@ 5.12.0 1.13.12 5.1.0 - 2023.0.9-SNAPSHOT + 2023.0.9 2.2.21 3.1.8 1.10.0 From 34b05727f35d7cc561961e1bd6ad2375fb4640bb Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 13:55:45 +0200 Subject: [PATCH 037/137] 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 4a49a177..906d07b4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.8 1.10.0 2.0.2 - 6.1.12-SNAPSHOT + 6.1.12 src/main/antora/antora-playbook.yml 0.0.3 1.0.0-alpha.4 From fc509ece00d221d66942ad8e467c4da6840b3339 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 14:48:12 +0200 Subject: [PATCH 038/137] Upgrade to RxJava 3.1.9. See #2351 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 906d07b4..754493b5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.1.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 04a873a9aef924f5b47e3fb0c0856f029304460a Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Wed, 14 Aug 2024 19:55:17 +0200 Subject: [PATCH 039/137] Upgrade to Spring HATEOAS 2.3.2. Fixes GH-2359. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 754493b5..7662847a 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.3.1 + 2.3.2 3.0.0 6.0.0 1.19.8 From ac55b8850faa562707475873e320c83044865436 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 16 Aug 2024 10:05:38 +0200 Subject: [PATCH 040/137] Prepare 3.3.3 (2024.0.3). See #2329 --- parent/pom.xml | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7662847a..9c090966 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2024.0.3-SNAPSHOT + 2024.0.3 @@ -413,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.3-SNAPSHOT + 3.3.3 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 27a1f152ff8197651c7c49b3e67196ccef4a0886 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 16 Aug 2024 10:05:57 +0200 Subject: [PATCH 041/137] Release version 3.3.3 (2024.0.3). See #2329 --- 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 9c090966..0d892809 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.3-SNAPSHOT + 3.3.3 ../pom.xml @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.3-SNAPSHOT + 3.3.3 zip true diff --git a/pom.xml b/pom.xml index 82c079a3..e2abffde 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.3-SNAPSHOT + 3.3.3 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 1e184f7e..51f4c05d 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.3-SNAPSHOT + 3.3.3 ../pom.xml From 5af13a463c8293d5f51f4e428416118eaccc352f Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 16 Aug 2024 10:08:53 +0200 Subject: [PATCH 042/137] Prepare next development iteration. See #2329 --- 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 0d892809..478faa58 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.3 + 3.3.4-SNAPSHOT ../pom.xml @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.3 + 3.3.4-SNAPSHOT zip true @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.3 + 3.3.4-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index e2abffde..43664709 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.3 + 3.3.4-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 51f4c05d..37e31b26 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.3 + 3.3.4-SNAPSHOT ../pom.xml From d5ef9b0b16c8726066d7fa6f97b22fa0bd46c9e8 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 16 Aug 2024 10:08:54 +0200 Subject: [PATCH 043/137] After release cleanups. See #2329 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 478faa58..f12a79a8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2024.0.3 + 2024.0.4-SNAPSHOT @@ -1441,8 +1441,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From a7679d623f984d254f9335510b1a997ea953d7d3 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 10 Sep 2024 14:48:53 +0200 Subject: [PATCH 044/137] Upgrade to Reactor 3.6.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 f12a79a8..ce9312a0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.12.0 1.13.12 5.1.0 - 2023.0.9 + 2023.0.10 2.2.21 3.1.9 1.10.0 From 03790a3de6ed76d53911bf163ba94b42183a92de Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 10 Sep 2024 14:49:13 +0200 Subject: [PATCH 045/137] Upgrade to Micrometer 1.13.4. Closes #2369 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ce9312a0..3d192d4e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.25 1.8.1 1.4.13 - 1.13.3 - 1.3.3 + 1.13.4 + 1.3.4 5.12.0 1.13.12 5.1.0 From 4e63824699c89d40f0323c325a2d748f1e42c688 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 11 Sep 2024 17:09:20 +0200 Subject: [PATCH 046/137] Upgrade Spring Framework to 6.1.13-SNAPSHOT. See #2367 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3d192d4e..99727e2e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.9 1.10.0 2.0.2 - 6.1.12 + 6.1.13-SNAPSHOT src/main/antora/antora-playbook.yml 0.0.3 1.0.0-alpha.4 From be74a09ef3d1318eb11bc5666619ef5cfd96d5a3 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 12 Sep 2024 14:25:04 +0200 Subject: [PATCH 047/137] Upgrade Spring Framework to 6.1.13 See #2367 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 99727e2e..06e6b3e0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.9 1.10.0 2.0.2 - 6.1.13-SNAPSHOT + 6.1.13 src/main/antora/antora-playbook.yml 0.0.3 1.0.0-alpha.4 From 512597028917ed2f272988a06d2a060b9341a747 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 12 Sep 2024 15:03:08 +0200 Subject: [PATCH 048/137] Upgrade to Spring HATEOAS 2.3.3. Fixes GH-2377. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 06e6b3e0..9672ab7a 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.3.2 + 2.3.3 3.0.0 6.0.0 1.19.8 From c39aa67bf4342a24d3474e938648ac360612c519 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 13 Sep 2024 11:36:34 +0200 Subject: [PATCH 049/137] Prepare 3.3.4 (2024.0.4). See #2362 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9672ab7a..5fe3898e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2024.0.4-SNAPSHOT + 2024.0.4 @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.4-SNAPSHOT + 3.3.4 zip true @@ -1441,20 +1441,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From d6d4727c074345a39371641f0f0d0fbef6e1c8a5 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 13 Sep 2024 11:36:54 +0200 Subject: [PATCH 050/137] Release version 3.3.4 (2024.0.4). See #2362 --- 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 5fe3898e..eb151f93 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.4-SNAPSHOT + 3.3.4 ../pom.xml @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.4-SNAPSHOT + 3.3.4 zip true diff --git a/pom.xml b/pom.xml index 43664709..618c56fc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.4-SNAPSHOT + 3.3.4 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 37e31b26..72eadc47 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.4-SNAPSHOT + 3.3.4 ../pom.xml From 4db9a4143d314eac6ba0225ececf9008d0ede45b Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 13 Sep 2024 11:40:08 +0200 Subject: [PATCH 051/137] Prepare next development iteration. See #2362 --- 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 eb151f93..c868570d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.4 + 3.3.5-SNAPSHOT ../pom.xml @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.4 + 3.3.5-SNAPSHOT zip true @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.4 + 3.3.5-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 618c56fc..e01e12d3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.4 + 3.3.5-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 72eadc47..8d5d15fa 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.4 + 3.3.5-SNAPSHOT ../pom.xml From f69b78cfc41d0f93f8a81d41b34aaa494bb0cb34 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 13 Sep 2024 11:40:09 +0200 Subject: [PATCH 052/137] After release cleanups. See #2362 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c868570d..399e4be5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2024.0.4 + 2024.0.5-SNAPSHOT @@ -1441,8 +1441,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 7b7dfe51351dc22cab83559e97392cbadd6eb6ce Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 9 Oct 2024 14:03:03 +0200 Subject: [PATCH 053/137] 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 f467fcf095c6d0f7c16808284b88bf46648ebb52 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 10 Oct 2024 09:06:55 +0200 Subject: [PATCH 054/137] Upgrade to Micrometer 1.13.5. See #2391 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 399e4be5..c2231d1b 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.8.1 1.4.13 From 19581174b4aa86d31c2e22ddd0e9bbb8a6d7e60e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 16 Oct 2024 08:51:02 +0200 Subject: [PATCH 057/137] Upgrade to Micrometer 1.13.6. Closes #2395 --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a2360820..5a9cdeed 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,8 +118,8 @@ 1.9.25 1.8.1 1.4.13 - 1.13.5 - 1.3.4 + 1.13.6 + 1.3.5 5.12.0 1.13.13 5.1.0 @@ -1456,4 +1456,4 @@ - \ No newline at end of file + From 4f07b3fea77a560358ad771ba63d47c221fe2b70 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 16 Oct 2024 08:52:07 +0200 Subject: [PATCH 058/137] Upgrade to Project Reactor 2023.0.11. Closes #2398 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5a9cdeed..5eba0f56 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -123,7 +123,7 @@ 5.12.0 1.13.13 5.1.0 - 2023.0.10 + 2023.0.11 2.2.21 3.1.9 1.10.0 From 54411a4468e9118c1f0dc0bca9879bdf4009ee52 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 17 Oct 2024 10:55:04 +0200 Subject: [PATCH 059/137] 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 5eba0f56..642fec25 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,7 +128,7 @@ 3.1.9 1.10.0 2.0.2 - 6.1.13 + 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 d1d9ea797031ab880ff8e00a5b671ee4c2c5f77e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Oct 2024 11:36:16 +0200 Subject: [PATCH 060/137] Prepare 3.3.5 (2024.0.5). See #2380 --- parent/pom.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 642fec25..9c2d18b6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2024.0.5-SNAPSHOT + 2024.0.5 @@ -413,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.5-SNAPSHOT + 3.3.5 zip true @@ -1440,20 +1441,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 9bfcb89d35d00f16c1a0a46d5948061c6ad674eb Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Oct 2024 11:36:33 +0200 Subject: [PATCH 061/137] Release version 3.3.5 (2024.0.5). See #2380 --- 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 9c2d18b6..ea6ef3dd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.5-SNAPSHOT + 3.3.5 ../pom.xml @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.5-SNAPSHOT + 3.3.5 zip true diff --git a/pom.xml b/pom.xml index e01e12d3..b6f16224 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.5-SNAPSHOT + 3.3.5 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 8d5d15fa..ee7be44d 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.5-SNAPSHOT + 3.3.5 ../pom.xml From 5d650c430833b8a2b84366d2d18b94ebb9144b95 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Oct 2024 11:39:04 +0200 Subject: [PATCH 062/137] Prepare next development iteration. See #2380 --- 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 ea6ef3dd..fc85b71b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.5 + 3.3.6-SNAPSHOT ../pom.xml @@ -414,7 +414,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.5 + 3.3.6-SNAPSHOT zip true @@ -722,7 +722,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.5 + 3.3.6-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index b6f16224..120649fc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.5 + 3.3.6-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index ee7be44d..b6ebefc7 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.5 + 3.3.6-SNAPSHOT ../pom.xml From e8e37b56ba468a50b15fa785b7463f19d0f78d06 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Oct 2024 11:39:05 +0200 Subject: [PATCH 063/137] After release cleanups. See #2380 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index fc85b71b..7053b36a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 4.0.2 - 2024.0.5 + 2024.0.6-SNAPSHOT @@ -1441,8 +1441,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 3b0faed3dd0cbe02b40d7e9dc5cbce3edd59ffa1 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 29 Oct 2024 08:59:53 +0100 Subject: [PATCH 064/137] Introduce JMH profile and `src/jmh/java` configuration to co-locate JMH benchmarks. Closes #2407 --- CONTRIBUTING.adoc | 35 ++++++++++++++++++++++++++-- parent/pom.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 2 -- 3 files changed, 91 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index b7d95b17..d0165f68 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -138,6 +138,37 @@ Upgrading to 2.7 is *not allowed*. ** During the milestone phase of a new release train, upgrade to the latest version of a dependency unless compatibility with a former version is required. Upgrades to new major versions are allowed, too, but consider ways to support multiple major versions for one release train to allow a smoother transition. +[[advanced.benchmarks]] +=== Benchmarks + +We use JMH for micro-benchmarks. + +Our benchmarks are located in the `src/jmh/java` directory so that we compile these as part of our main build. To run benchmarks during development we leverage JUnit 5 and the https://github.com/mp911de/microbenchmark-runner[Microbenchmark Runner]. +Enable the `jmh` Maven Profile, add `@Testable` to the benchmark you want to run (of the benchmark class) and run it as it was a JUnit test right from your IDE. + +NOTE: Microbenchmark Runner is not a tool for running final benchmarks, rather it helps to quickly run benchmarks during development to reduce turnaround time. + +Benchmarks aren't ran during the build. + +JMH's Benchmark Generator (Annotation Processor) must be enabled in each module with the Maven Compiler, see the following example: + +[source,xml] +---- + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh} + + + + +---- + [[advanced.change-tracking]] === Change tracking @@ -192,7 +223,7 @@ Make sure you keep the original author when amending. curl $PULL_REQUEST_URL.patch | git am --ignore-whitespace ---- -* If the you merge back a feature branch and multiple developers contributed to that, try to rearrange to commits and squash the into a single commit per developer. +* If you merge back a feature branch and multiple developers contributed to that, try to rearrange to commits and squash the into a single commit per developer. Combine the commit messages and edit them to make sense. * Before pushing the changes to the remote repository, amend the commit(s) to be pushed and add a reference to the pull request to them. This will cause the pull request UI in GitHub show and link those commits. @@ -201,5 +232,5 @@ This will cause the pull request UI in GitHub show and link those commits. ---- … -Original pull request #?? +Original pull request: #?? ---- diff --git a/parent/pom.xml b/parent/pom.xml index 7053b36a..23df0514 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -112,6 +112,7 @@ 0.8.12 1.9.0 0.21.0 + 1.37 2.6.0 4.13.2 @@ -936,6 +937,24 @@ + + jmh + + + com.github.mp911de.microbenchmark-runner + microbenchmark-runner-junit5 + 0.4.0.RELEASE + test + + + + + jitpack.io + https://jitpack.io + + + + @@ -1025,6 +1044,12 @@ ${webbeans} test + + org.openjdk.jmh + jmh-generator-annprocess + test + ${jmh} + @@ -1043,6 +1068,14 @@ test + + + org.openjdk.jmh + jmh-core + test + ${jmh} + + org.mockito mockito-core @@ -1287,6 +1320,19 @@ + + jmh-compile + test-compile + + test-compile + + + + ${project.basedir}/src/jmh/kotlin + ${project.basedir}/src/jmh/java + + + @@ -1377,6 +1423,18 @@ org.codehaus.mojo build-helper-maven-plugin + + add-jmh-source + generate-test-sources + + add-test-source + + + + ${project.basedir}/src/jmh/java + + + add-kotlin-source prepare-package diff --git a/pom.xml b/pom.xml index 120649fc..9d452f45 100644 --- a/pom.xml +++ b/pom.xml @@ -100,8 +100,6 @@ - - org.apache.maven.plugins maven-enforcer-plugin From 48978345e5d775ae7abb16bf967b1e7b7df4ea1c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 7 Nov 2024 09:48:01 +0100 Subject: [PATCH 065/137] Upgrade to Maven Wrapper 3.9.9. See #2410 --- .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 9375ebd1..06cb22fb 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -#Thu Aug 08 10:18:12 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:48:01 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 9854343a64bcc332fd827360d1a2bc10596a2c1a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 7 Nov 2024 09:58:29 +0100 Subject: [PATCH 066/137] 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 40bb3491..6dff7220 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 8d3d17a5ef5ceb3659a5669fafcd49f34eaa2496 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 8 Nov 2024 11:46:50 +0100 Subject: [PATCH 067/137] Upgrade to Jackson 2.17.3. See #2414 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 23df0514..1b8382c2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.0.6-SNAPSHOT + 2024.0.6 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.6-SNAPSHOT + 3.3.6 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From a5860414d33990ab4883791d537bc9ae282d39dd Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Nov 2024 11:45:37 +0100 Subject: [PATCH 072/137] Release version 3.3.6 (2024.0.6). See #2405 --- 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 14a1d547..6f7e77fd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.6-SNAPSHOT + 3.3.6 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.6-SNAPSHOT + 3.3.6 zip true diff --git a/pom.xml b/pom.xml index 9d452f45..cd8594ce 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.6-SNAPSHOT + 3.3.6 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index b6ebefc7..5018f0a8 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.6-SNAPSHOT + 3.3.6 ../pom.xml From 1ab6cc5aa8961f981679159a4af5fe006bf60122 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Nov 2024 11:47:56 +0100 Subject: [PATCH 073/137] Prepare next development iteration. See #2405 --- 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 6f7e77fd..465ff3a4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.6 + 3.3.7-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.6 + 3.3.7-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.6 + 3.3.7-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index cd8594ce..ca9b3ba1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.6 + 3.3.7-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 5018f0a8..fd92c216 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.6 + 3.3.7-SNAPSHOT ../pom.xml From c5249b774697b69891faa8ee8b16b6008383ae91 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Nov 2024 11:47:58 +0100 Subject: [PATCH 074/137] After release cleanups. See #2405 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 465ff3a4..966d6bc4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.2 - 2024.0.6 + 2024.0.7-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 579e562fc86b7b7541ef8eae3b4c7614101064f1 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 18 Nov 2024 12:02:12 +0100 Subject: [PATCH 075/137] Upgrade build plugins. Closes #2429 --- parent/pom.xml | 34 +++++++++---------- pom.xml | 6 ++-- .../src/main/resources/assemblies/docs.xml | 2 +- .../main/resources/assemblies/resources.xml | 4 +-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 966d6bc4..cb286ae0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,7 +119,7 @@ 5.10.5 1.9.25 1.8.1 - 1.4.13 + 1.5.12 1.13.7 1.3.6 5.12.0 @@ -132,7 +132,7 @@ 2.0.2 6.1.15 src/main/antora/antora-playbook.yml - 0.0.3 + 0.0.4 1.0.0-alpha.4 0.0.7 2.3.3 @@ -521,7 +521,7 @@ - + @@ -1160,13 +1160,13 @@ org.apache.maven.plugins maven-assembly-plugin - 3.6.0 + 3.7.1 org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.13.0 true true @@ -1176,12 +1176,12 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.3.1 + 3.6.0 com.puppycrawl.tools checkstyle - 10.9.3 + 10.20.1 io.spring.nohttp @@ -1194,25 +1194,25 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.8.1 org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.3 org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 org.apache.maven.plugins maven-failsafe-plugin - 3.2.5 + 3.5.2 false @@ -1227,25 +1227,25 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.2 org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.11.1 org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.5.2 false @@ -1254,13 +1254,13 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 org.codehaus.mojo exec-maven-plugin - 3.1.1 + 3.5.0 diff --git a/pom.xml b/pom.xml index ca9b3ba1..265085b8 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.2.7 sign-artifacts @@ -103,7 +103,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 enforce-release-rules @@ -209,7 +209,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true sonatype diff --git a/resources/src/main/resources/assemblies/docs.xml b/resources/src/main/resources/assemblies/docs.xml index c72e8d45..ce0c5c01 100644 --- a/resources/src/main/resources/assemblies/docs.xml +++ b/resources/src/main/resources/assemblies/docs.xml @@ -31,7 +31,7 @@ Adds javadoc html to the distribution archive under the 'docs/javadoc' directory see pom.xml 'maven-javadoc-plugin' declaration. --> - ${project.root}/target/site/apidocs + ${project.root}/target/reports/apidocs api diff --git a/resources/src/main/resources/assemblies/resources.xml b/resources/src/main/resources/assemblies/resources.xml index b8538dc5..cc78a039 100644 --- a/resources/src/main/resources/assemblies/resources.xml +++ b/resources/src/main/resources/assemblies/resources.xml @@ -28,8 +28,8 @@ Adds javadoc html to the distribution archive under the 'docs/javadoc' directory see pom.xml 'maven-javadoc-plugin' declaration. --> - ${project.root}/target/site/apidocs + ${project.root}/target/reports/apidocs docs/api - \ No newline at end of file + From 58221161fa4e037fe51f4acb8960ab54151c6dc0 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 11 Dec 2024 09:00:58 +0100 Subject: [PATCH 076/137] Upgrade to Micrometer Tracing 1.3.7. See #2437 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index cb286ae0..acc62ce6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.0.7-SNAPSHOT + 2024.0.7 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.7-SNAPSHOT + 3.3.7 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + - \ No newline at end of file + From 400f8f03c984c75a9e29a83e314f01a8e042ad2d Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 13 Dec 2024 10:51:12 +0100 Subject: [PATCH 083/137] Release version 3.3.7 (2024.0.7). See #2425 --- 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 e17b5c61..b01d7896 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.7-SNAPSHOT + 3.3.7 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.7-SNAPSHOT + 3.3.7 zip true diff --git a/pom.xml b/pom.xml index 265085b8..f15b4c69 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.7-SNAPSHOT + 3.3.7 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index fd92c216..0c089689 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.7-SNAPSHOT + 3.3.7 ../pom.xml From ecce71f3463faa32febf8c0dec623230de74bb40 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 13 Dec 2024 10:54:20 +0100 Subject: [PATCH 084/137] Prepare next development iteration. See #2425 --- 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 b01d7896..dca87c42 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.7 + 3.3.8-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.7 + 3.3.8-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.7 + 3.3.8-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index f15b4c69..2b5cefbd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.7 + 3.3.8-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 0c089689..8567e007 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.7 + 3.3.8-SNAPSHOT ../pom.xml From 962c5db8d58c74b5ca0a4667e64139dd807907c5 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 13 Dec 2024 10:54:22 +0100 Subject: [PATCH 085/137] After release cleanups. See #2425 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index dca87c42..c74059eb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.2 - 2024.0.7 + 2024.0.8-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 05fceb2011575bf8844ee42578b0b608e3bef91f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 8 Jan 2025 09:55:46 +0100 Subject: [PATCH 086/137] Extend license header copyright years to 2025. See #2446 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b5cefbd..fc4e88bf 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-2024 the original author or authors. + Copyright 2010-2025 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 7fd165ec0bf0ac96691d6feb2ca5476938ff5c8b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 10 Jan 2025 10:31:55 +0100 Subject: [PATCH 087/137] Upgrade to OpenWebBeans 4.0.3. See #2453 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c74059eb..a244ddb4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + 2024.0.8-SNAPSHOT @@ -1515,4 +1514,4 @@ - + \ No newline at end of file From a3ef9292a7a66521dc1567d9540b997c76044992 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 10 Jan 2025 10:31:55 +0100 Subject: [PATCH 088/137] Upgrade to Mockk 1.13.14. See #2452 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a244ddb4..c711d7f1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -122,7 +122,7 @@ 1.13.9 1.3.7 5.12.0 - 1.13.13 + 1.13.14 5.1.0 2023.0.13 2.2.21 From 5b84d0ca7e1f905e081c78f7d0fbf6bda1276d65 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 10 Jan 2025 10:51:41 +0100 Subject: [PATCH 089/137] Switch from CLA to DCO. Closes #2471 --- .github/dco.yml | 2 ++ CONTRIBUTING.adoc | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .github/dco.yml diff --git a/.github/dco.yml b/.github/dco.yml new file mode 100644 index 00000000..0c4b142e --- /dev/null +++ b/.github/dco.yml @@ -0,0 +1,2 @@ +require: + members: false diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index d0165f68..f4023c5b 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -68,7 +68,7 @@ Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only). 7. Make sure you follow the <> guidelines. 8. Make sure you provide your full name and an email address registered with your GitHub account. -If you're a first-time submitter, make sure you have signed the https://cla.pivotal.io/sign/spring[Contributor License Agreement]. +All commits must include a __Signed-off-by__ trailer at the end of each commit message to indicate that the contributor agrees to the Developer Certificate of Origin. 9. You may sign your commits with a GPG key. As we generally cherry-pick commits for merging, it can happen that your signature is replaced by a signature from a maintainer that pushes your changes to the target branches. @@ -208,7 +208,8 @@ For methods consisting of more than one line of code, have a blank line after th * Be polite. It might be the first time someone contributes to an OpenSource project so we should forgive violations to the contribution guidelines. Use some gut feeling to find out in how far it makes sense to ask the reporter to fix stuff or just go ahead and add a polishing commit yourself. -* Before we accept a non-trivial patch or pull request we will need you to https://cla.pivotal.io/sign/spring[sign the Contributor License Agreement]. +* All commits must include a __Signed-off-by__ trailer at the end of each commit message to indicate that the contributor agrees to the Developer Certificate of Origin. +For additional details, please refer to the blog post https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring[Hello DCO, Goodbye CLA: Simplifying Contributions to Spring]. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request. * Before merging stuff back into `main`, make sure you rebase the branch. From e33157068acbd3d9729f006c1acdce7cb5f2e966 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 16 Jan 2025 09:06:03 +0100 Subject: [PATCH 090/137] Upgrade to Micrometer 1.13.10. Closes #2474 --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c711d7f1..bd2105a9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.25 1.8.1 1.5.12 - 1.13.9 - 1.3.7 + 1.13.10 + 1.3.8 5.12.0 1.13.14 5.1.0 @@ -1514,4 +1514,4 @@ - \ No newline at end of file + From 593199e5976883df7e22d342824b55556976a60b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 16 Jan 2025 09:06:28 +0100 Subject: [PATCH 091/137] Upgrade to Reactor 2023.0.14. Closes #2475 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index bd2105a9..d90a0454 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.12.0 1.13.14 5.1.0 - 2023.0.13 + 2023.0.14 2.2.21 3.1.10 1.10.0 From 7dcff030cb403ef700f8055f6a5541b126c8253a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Jan 2025 10:32:00 +0100 Subject: [PATCH 092/137] Prepare 3.3.8 (2024.0.8). See #2445 --- parent/pom.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index d90a0454..6c5f030f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2024.0.8-SNAPSHOT + 2024.0.8 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.8-SNAPSHOT + 3.3.8 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From dad753407299efba4636b36438abd7ae867aa943 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Jan 2025 10:32:17 +0100 Subject: [PATCH 093/137] Release version 3.3.8 (2024.0.8). See #2445 --- 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 6c5f030f..0ece0ae2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.8-SNAPSHOT + 3.3.8 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.8-SNAPSHOT + 3.3.8 zip true diff --git a/pom.xml b/pom.xml index fc4e88bf..daa801e4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.8-SNAPSHOT + 3.3.8 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 8567e007..33c17ef7 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.8-SNAPSHOT + 3.3.8 ../pom.xml From addb51df7a50dd05a3e8be1247b643ab70b45501 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Jan 2025 10:34:45 +0100 Subject: [PATCH 094/137] Prepare next development iteration. See #2445 --- 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 0ece0ae2..cef06312 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.8 + 3.3.9-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.8 + 3.3.9-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.8 + 3.3.9-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index daa801e4..4bca2b3d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.8 + 3.3.9-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 33c17ef7..893b6ee2 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.8 + 3.3.9-SNAPSHOT ../pom.xml From 56dd47acce9b4432f355da312338de95165fc388 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Jan 2025 10:34:46 +0100 Subject: [PATCH 095/137] After release cleanups. See #2445 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index cef06312..949c3c3a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.8 + 2024.0.9-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From b834fbc7d1f79d325837ac8f2d0ae0a0672e69a0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 11 Feb 2025 15:20:20 +0100 Subject: [PATCH 096/137] Bump Develocity plugin to 0.0.22. Also, add jvm.config in preparation for ErrorProne. See #2427 --- .mvn/extensions.xml | 2 +- .mvn/jvm.config | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .mvn/jvm.config diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 1e3bb355..e0857eaa 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ io.spring.develocity.conventions develocity-conventions-maven-extension - 0.0.19 + 0.0.22 diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 00000000..32599cef --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1,10 @@ +--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED From cc44a75690a4d14638e670a0e12d5ac82eba8cb8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Feb 2025 14:18:35 +0100 Subject: [PATCH 097/137] Upgrade to Project Reactor 2023.0.15. Closes #2487 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 949c3c3a..8b6d9c59 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.12.0 1.13.14 5.1.0 - 2023.0.14 + 2023.0.15 2.2.21 3.1.10 1.10.0 From e64d1369fe8e855f3a2111b3c0df1e7edebe6e5a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Feb 2025 14:18:45 +0100 Subject: [PATCH 098/137] Upgrade to Spring Framework 6.1.17. Closes #2489 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8b6d9c59..cd086dd1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ 3.1.10 1.10.0 2.0.2 - 6.1.16 + 6.1.17 src/main/antora/antora-playbook.yml 0.0.4 1.0.0-alpha.4 @@ -908,7 +908,7 @@ spring6-next - 6.1.17-SNAPSHOT + 6.1.18-SNAPSHOT From 6bc373c33540a4031dc6b7dd4cd38f9cb4de978e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Feb 2025 14:19:31 +0100 Subject: [PATCH 099/137] Upgrade to Micrometer 1.13.11. Closes #2484 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index cd086dd1..0b235c53 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.8.1 1.5.12 - 1.13.10 - 1.3.8 + 1.13.11 + 1.3.9 5.12.0 1.13.14 5.1.0 From 0fb32832acfe7a29bcf0fb98e1cfd2bfab67ce91 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 09:49:40 +0100 Subject: [PATCH 100/137] Prepare 3.3.9 (2024.0.9). See #2478 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0b235c53..ff576c4f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.9-SNAPSHOT + 2024.0.9 @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.9-SNAPSHOT + 3.3.9 zip true @@ -1499,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From a96aefc5bcb20ae040af52e8d6e6690cb7914ff3 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 09:50:00 +0100 Subject: [PATCH 101/137] Release version 3.3.9 (2024.0.9). See #2478 --- 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 ff576c4f..7c0671ce 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.9-SNAPSHOT + 3.3.9 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.9-SNAPSHOT + 3.3.9 zip true diff --git a/pom.xml b/pom.xml index 4bca2b3d..943ba80b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.9-SNAPSHOT + 3.3.9 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 893b6ee2..2a79983e 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.9-SNAPSHOT + 3.3.9 ../pom.xml From dbd0fece7b27785a7294da7e79e6539f659649df Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 09:52:49 +0100 Subject: [PATCH 102/137] Prepare next development iteration. See #2478 --- 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 7c0671ce..0a1c4fe8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.9 + 3.3.10-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.9 + 3.3.10-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.9 + 3.3.10-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 943ba80b..64cf6324 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.9 + 3.3.10-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 2a79983e..ccd3e5e5 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.9 + 3.3.10-SNAPSHOT ../pom.xml From ca9d9a292de75e34b79fed94334f2b05e6412cd1 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 09:52:50 +0100 Subject: [PATCH 103/137] After release cleanups. See #2478 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0a1c4fe8..777fddec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.9 + 2024.0.10-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From ae0462b86109636cdba6a6375af75c32d8be9a9a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 10:34:57 +0100 Subject: [PATCH 104/137] Downgrade Sonatype Nexus plugin and xstream dependency. Closes #2494 --- pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64cf6324..a55e8dff 100644 --- a/pom.xml +++ b/pom.xml @@ -209,7 +209,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.7.0 + 1.6.8 true sonatype @@ -217,6 +217,13 @@ false true + + + com.thoughtworks.xstream + xstream + 1.4.15 + + From b0c5c3c2803464112db67b0dadc6c125dbf39678 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 12:16:43 +0100 Subject: [PATCH 105/137] Add workaround for Sonatype staging plugin that won't be fixed for newer Java versions. Closes #2494 --- .mvn/jvm.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index 32599cef..e27f6e8f 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -8,3 +8,7 @@ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED +--add-opens=java.base/java.util=ALL-UNNAMED +--add-opens=java.base/java.lang.reflect=ALL-UNNAMED +--add-opens=java.base/java.text=ALL-UNNAMED +--add-opens=java.desktop/java.awt.font=ALL-UNNAMED From 67f33bd538a7cf835644e4d365959b9394d3869c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Mar 2025 14:50:29 +0100 Subject: [PATCH 106/137] Upgrade to Spring Framework 6.1.18. Closes #2509 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 777fddec..26b57e63 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ 3.1.10 1.10.0 2.0.2 - 6.1.17 + 6.1.18 src/main/antora/antora-playbook.yml 0.0.4 1.0.0-alpha.4 @@ -908,7 +908,7 @@ spring6-next - 6.1.18-SNAPSHOT + 6.1.19-SNAPSHOT From 56a644061d5bbbe14457c06f6435793e1981689f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Mar 2025 14:50:48 +0100 Subject: [PATCH 107/137] Upgrade to Reactor 2023.0.16. Closes #2507 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 26b57e63..b83d8847 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.12.0 1.13.14 5.1.0 - 2023.0.15 + 2023.0.16 2.2.21 3.1.10 1.10.0 From 6be046eb3bd8c679de2c15ca4a6e49d52247e3df Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Mar 2025 14:51:45 +0100 Subject: [PATCH 108/137] Upgrade to Micrometer 1.13.12. Closes #2504 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b83d8847..3effb844 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.8.1 1.5.12 - 1.13.11 - 1.3.9 + 1.13.12 + 1.3.10 5.12.0 1.13.14 5.1.0 From 31f81db951d9f503c6114f2e1dadc98248513d40 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Mar 2025 07:35:40 +0100 Subject: [PATCH 109/137] Prepare 3.3.10 (2024.0.10). See #2496 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3effb844..dde1c714 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.10-SNAPSHOT + 2024.0.10 @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.10-SNAPSHOT + 3.3.10 zip true @@ -1499,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From d05788695f528539f4aaa0ab26b1766845ff3406 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Mar 2025 07:35:59 +0100 Subject: [PATCH 110/137] Release version 3.3.10 (2024.0.10). See #2496 --- 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 dde1c714..7fac63ca 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.10-SNAPSHOT + 3.3.10 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.10-SNAPSHOT + 3.3.10 zip true diff --git a/pom.xml b/pom.xml index a55e8dff..f04717f2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.10-SNAPSHOT + 3.3.10 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index ccd3e5e5..4a17b0cc 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.10-SNAPSHOT + 3.3.10 ../pom.xml From 4cac509da458ac2fb0792efed88a0ef5b19d285c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Mar 2025 07:38:27 +0100 Subject: [PATCH 111/137] Prepare next development iteration. See #2496 --- 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 7fac63ca..3e5af164 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.10 + 3.3.11-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.10 + 3.3.11-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.10 + 3.3.11-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index f04717f2..8869bfb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.10 + 3.3.11-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 4a17b0cc..47b23f80 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.10 + 3.3.11-SNAPSHOT ../pom.xml From 435584d07593672eafee70001d6e3e8e059d8ca4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Mar 2025 07:38:28 +0100 Subject: [PATCH 112/137] After release cleanups. See #2496 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3e5af164..9432b906 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.10 + 2024.0.11-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 60378912f30e5f0fe9e56952aa4c1a8d89179813 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 17 Apr 2025 08:48:50 +0200 Subject: [PATCH 113/137] Upgrade to Micrometer 1.13.13. Closes #2521 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9432b906..9b79d444 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.8.1 1.5.12 - 1.13.12 - 1.3.10 + 1.13.13 + 1.3.11 5.12.0 1.13.14 5.1.0 From 4bc6558fad81f18ab763617f5ee54fb293d5691f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 17 Apr 2025 08:49:42 +0200 Subject: [PATCH 114/137] Upgrade to Project Reactor 2023.0.17. Closes #2539 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9b79d444..61bdffc3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.12.0 1.13.14 5.1.0 - 2023.0.16 + 2023.0.17 2.2.21 3.1.10 1.10.0 From fe0ca16664d1089b81596e8faf61a95d7913cdf1 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 17 Apr 2025 08:52:37 +0200 Subject: [PATCH 115/137] Upgrade to AspectJ 1.9.24. See #2540 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 61bdffc3..99499a55 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.0.11-SNAPSHOT + 2024.0.11 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.11-SNAPSHOT + 3.3.11 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From e8c4a8e1ce5f45f1153915c71cf6ea45f17a2821 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Apr 2025 09:58:40 +0200 Subject: [PATCH 120/137] Release version 3.3.11 (2024.0.11). See #2502 --- 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 3944496c..1e03e734 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.11-SNAPSHOT + 3.3.11 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.11-SNAPSHOT + 3.3.11 zip true diff --git a/pom.xml b/pom.xml index 8869bfb7..e95ff6eb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.11-SNAPSHOT + 3.3.11 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 47b23f80..5da928f4 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.11-SNAPSHOT + 3.3.11 ../pom.xml From 4504b451f73f5a14c53f8d8235bdfc75076d1bc3 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Apr 2025 10:01:23 +0200 Subject: [PATCH 121/137] Prepare next development iteration. See #2502 --- 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 1e03e734..b39669a8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.11 + 3.3.12-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.11 + 3.3.12-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.11 + 3.3.12-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index e95ff6eb..41d5136b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.11 + 3.3.12-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 5da928f4..3db4ddee 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.11 + 3.3.12-SNAPSHOT ../pom.xml From e140bedbfdaac72df9e461fc7688c58a6f8cca49 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Apr 2025 10:01:25 +0200 Subject: [PATCH 122/137] After release cleanups. See #2502 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b39669a8..48523c79 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.11 + 2024.0.12-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From cc1f432c8eaf25ebc56449a71922c93e0156d146 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 12 May 2025 08:58:49 +0200 Subject: [PATCH 123/137] Upgrade build to Java 17.0.15. Closes #2564 --- ci/pipeline.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 6dff7220..81d1e290 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,5 +1,5 @@ # Java versions -java.main.tag=17.0.13_11-jdk-focal +java.main.tag=17.0.15_6-jdk-focal java.next.tag=22.0.2_9-jdk-jammy # Docker container images - standard From e34851be073e20995e73a5e6435089b23e49ce04 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 15 May 2025 11:24:55 +0200 Subject: [PATCH 124/137] Upgrade to Micrometer 1.13.14. Closes #2554 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 48523c79..db05eab0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.8.1 1.5.12 - 1.13.13 - 1.3.11 + 1.13.14 + 1.3.12 5.12.0 1.13.17 5.1.0 From faab83cab86619aa7c0c1a434a49ec96831e6ae9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 15 May 2025 11:25:49 +0200 Subject: [PATCH 125/137] Upgrade to Reactor 2023.0.18. Closes #2557 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index db05eab0..ce2e08be 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.12.0 1.13.17 5.1.0 - 2023.0.17 + 2023.0.18 2.2.21 3.1.10 1.10.0 From 9aed160c3bfe4a75554688e65f99cbd9e046fe97 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 15 May 2025 11:27:16 +0200 Subject: [PATCH 126/137] Upgrade to Spring Framework 6.1.20. Closes #2560 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ce2e08be..005fbd57 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ 3.1.10 1.10.0 2.0.2 - 6.1.19 + 6.1.20 src/main/antora/antora-playbook.yml 0.0.4 1.0.0-alpha.4 @@ -908,7 +908,7 @@ spring6-next - 6.1.20-SNAPSHOT + 6.1.21-SNAPSHOT From ae6de48d0f0af8671b41668fd122a557b6454572 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 May 2025 10:05:34 +0200 Subject: [PATCH 127/137] Prepare 3.3.12 (2024.0.12). See #2548 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 005fbd57..0777701b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.12-SNAPSHOT + 2024.0.12 @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.12-SNAPSHOT + 3.3.12 zip true @@ -1499,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From edba5fa7ca15c5068d1e505b53562b9360478524 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 May 2025 10:05:54 +0200 Subject: [PATCH 128/137] Release version 3.3.12 (2024.0.12). See #2548 --- 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 0777701b..a056856d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.12-SNAPSHOT + 3.3.12 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.12-SNAPSHOT + 3.3.12 zip true diff --git a/pom.xml b/pom.xml index 41d5136b..4d429e2b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.12-SNAPSHOT + 3.3.12 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 3db4ddee..ef6cd1b6 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.12-SNAPSHOT + 3.3.12 ../pom.xml From c34821984965061ba805d4bc35f38561ec3e5624 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 May 2025 10:08:24 +0200 Subject: [PATCH 129/137] Prepare next development iteration. See #2548 --- 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 a056856d..8a80b731 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.12 + 3.3.13-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.12 + 3.3.13-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.12 + 3.3.13-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 4d429e2b..32b21754 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.12 + 3.3.13-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index ef6cd1b6..a0a29c6e 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.12 + 3.3.13-SNAPSHOT ../pom.xml From 4f4b1ddf72e5eefb72ceb7f3e24f0a99c29a6eb7 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 May 2025 10:08:26 +0200 Subject: [PATCH 130/137] After release cleanups. See #2548 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8a80b731..56c4a508 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.12 + 2024.0.13-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 81269e1fc6f4931a0d0fc9ac6f7b85cad19a21cf Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 11 Jun 2025 14:09:06 +0200 Subject: [PATCH 131/137] Upgrade to Project Reactor 2023.0.19. Closes #2583 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 56c4a508..c2a85a96 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.12.0 1.13.17 5.1.0 - 2023.0.18 + 2023.0.19 2.2.21 3.1.10 1.10.0 From 55f30b83c6e5c276437e9b0566f2353670aebdb4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 11 Jun 2025 14:09:47 +0200 Subject: [PATCH 132/137] Upgrade to Micrometer 1.13.15. Closes #2585 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c2a85a96..86432b93 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.8.1 1.5.12 - 1.13.14 - 1.3.12 + 1.13.15 + 1.3.13 5.12.0 1.13.17 5.1.0 From 849d610a6793a98c83c411bedf2720791a92e848 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 12 Jun 2025 16:19:45 +0200 Subject: [PATCH 133/137] Upgrade to Spring Framework 6.1.12. Closes #2581 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 86432b93..c1b9a63f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ 3.1.10 1.10.0 2.0.2 - 6.1.20 + 6.1.21 src/main/antora/antora-playbook.yml 0.0.4 1.0.0-alpha.4 @@ -908,7 +908,7 @@ spring6-next - 6.1.21-SNAPSHOT + 6.1.22-SNAPSHOT From edac2a6fbd4b6a04e66398164204caefbfebe376 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 13 Jun 2025 10:15:40 +0200 Subject: [PATCH 134/137] Prepare 3.3.13 (2024.0.13). See #2575 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c1b9a63f..02ed0de5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.13-SNAPSHOT + 2024.0.13 @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.13-SNAPSHOT + 3.3.13 zip true @@ -1499,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 0d48693474c969cfbe36bc483cea1b1dd1b3731a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 13 Jun 2025 10:16:00 +0200 Subject: [PATCH 135/137] Release version 3.3.13 (2024.0.13). See #2575 --- 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 02ed0de5..ecba8c33 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.13-SNAPSHOT + 3.3.13 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.13-SNAPSHOT + 3.3.13 zip true diff --git a/pom.xml b/pom.xml index 32b21754..1d38c799 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.13-SNAPSHOT + 3.3.13 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index a0a29c6e..fff559ce 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.13-SNAPSHOT + 3.3.13 ../pom.xml From 7dc62bc370311c02e3537baaee997d3d131d5ad1 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 13 Jun 2025 10:18:22 +0200 Subject: [PATCH 136/137] Prepare next development iteration. See #2575 --- 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 ecba8c33..cb3ee8c2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.3.13 + 3.3.14-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.13 + 3.3.14-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.3.13 + 3.3.14-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 1d38c799..b19fe2ca 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.3.13 + 3.3.14-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index fff559ce..0ba0e644 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.3.13 + 3.3.14-SNAPSHOT ../pom.xml From c5f7a78c97c57cdbeea4bac2e3ff7e29c8357bf7 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 13 Jun 2025 10:18:24 +0200 Subject: [PATCH 137/137] After release cleanups. See #2575 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index cb3ee8c2..022f4a61 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.0.13 + 2024.0.14-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone +