From 767f45069f0adb83e715e2f8969ccb6a22b2b8c6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Nov 2024 14:13:25 +0100 Subject: [PATCH 001/120] Prepare next development iteration. See #2406 --- 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 7338e977..1dbb636d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.0 + 3.4.1-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.0 + 3.4.1-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.0 + 3.4.1-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 45669a97..061c6c1e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.0 + 3.4.1-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index fa76c825..7b604740 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.0 + 3.4.1-SNAPSHOT ../pom.xml From ec289f1869babfbd3c1bd3a57b45ef52dcf5782a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Nov 2024 14:13:26 +0100 Subject: [PATCH 002/120] After release cleanups. See #2406 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1dbb636d..38188f38 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.2 - 2024.1.0 + 2024.1.1-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 74a32cd6877fac66db568de864276484ac3f45a6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 18 Nov 2024 12:02:12 +0100 Subject: [PATCH 003/120] 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 38188f38..68d39bd3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,7 +119,7 @@ 5.11.3 1.9.25 1.9.0 - 1.4.13 + 1.5.12 1.14.0 1.4.0 5.14.2 @@ -132,7 +132,7 @@ 2.0.2 6.2.0 src/main/antora/antora-playbook.yml - 0.0.3 + 0.0.4 1.0.0-alpha.4 0.0.7 2.4.0 @@ -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 061c6c1e..18aaaf73 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 ecd9fc8bad16d6909056d7122beca91627657b75 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 9 Dec 2024 12:55:19 +0100 Subject: [PATCH 004/120] Build against Spring Framework 6.2.1 snapshots. See: #2430 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 68d39bd3..fa3ca080 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ 3.1.9 1.10.0 2.0.2 - 6.2.0 + 6.2.1-SNAPSHOT src/main/antora/antora-playbook.yml 0.0.4 1.0.0-alpha.4 From 4767cd3f027e5a46cb665451634cdb0a5462b9c7 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 10 Dec 2024 16:46:23 +0100 Subject: [PATCH 005/120] Upgrade to Micrometer Tracing 1.4.1. See #2433 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index fa3ca080..e9b43521 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.1.1-SNAPSHOT + 2024.1.1 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.1-SNAPSHOT + 3.4.1 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 4950d0b8265a2828be13c725ef7f7c56ae2c3d9f Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 13 Dec 2024 09:34:47 +0100 Subject: [PATCH 014/120] Release version 3.4.1 (2024.1.1). See #2426 --- 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 c1960e02..339ad510 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.1-SNAPSHOT + 3.4.1 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.1-SNAPSHOT + 3.4.1 zip true diff --git a/pom.xml b/pom.xml index 18aaaf73..d21bd18e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.1-SNAPSHOT + 3.4.1 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 7b604740..68b0e4b5 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.1-SNAPSHOT + 3.4.1 ../pom.xml From 07412bd4bc77264e1faf67240a0fe37be95acbd0 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 13 Dec 2024 09:38:10 +0100 Subject: [PATCH 015/120] Prepare next development iteration. See #2426 --- 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 339ad510..ffc6dd5c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.1 + 3.4.2-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.1 + 3.4.2-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.1 + 3.4.2-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index d21bd18e..fc21233b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.1 + 3.4.2-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 68b0e4b5..9002f70a 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.1 + 3.4.2-SNAPSHOT ../pom.xml From 033a5e45ad43be936b2aa6c2983c7f435f5fa05f Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 13 Dec 2024 09:38:12 +0100 Subject: [PATCH 016/120] After release cleanups. See #2426 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ffc6dd5c..0d712150 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.2 - 2024.1.1 + 2024.1.2-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From f1c9daa8bcd1970c9cad0a3666dbf4c5e51ac672 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 8 Jan 2025 09:58:42 +0100 Subject: [PATCH 017/120] Extend license header copyright years to 2025. See #2447 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc21233b..1f17a413 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 81a1bcb2e6d6eff7756a32b95431d7a6726246c9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 10 Jan 2025 10:39:03 +0100 Subject: [PATCH 018/120] Upgrade to OpenWebBeans 4.0.3. See #2456 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0d712150..c9badb72 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + 2024.1.2-SNAPSHOT @@ -1515,4 +1514,4 @@ - + \ No newline at end of file From a8e1b180e1d34905f2986bc5941272594ac69c3d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 10 Jan 2025 10:39:03 +0100 Subject: [PATCH 019/120] Upgrade to Mockk 1.13.14. See #2455 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index c9badb72..51c88877 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -122,7 +122,7 @@ 1.14.2 1.4.1 5.14.2 - 1.13.13 + 1.13.14 5.1.0 2024.0.1 2.2.21 From 2a81139393e5d49f24ede2f0c282e3d4ca9ff187 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 10 Jan 2025 10:39:04 +0100 Subject: [PATCH 020/120] Upgrade to JUnit 5.11.4. See #2454 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 51c88877..30f36340 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -115,7 +115,7 @@ 2.6.0 4.13.2 - 5.11.3 + 5.11.4 1.9.25 1.9.0 1.5.12 From 75fb7e749892c2111648804213873e365c6d38c2 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 10 Jan 2025 10:50:33 +0100 Subject: [PATCH 021/120] Upgrade to vavr 0.10.5. Closes #2470 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 30f36340..cdaf451e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -139,7 +139,7 @@ 6.0.0 1.20.4 3.0.2 - 0.10.4 + 0.10.5 4.0.3 @@ -1514,4 +1514,4 @@ - \ No newline at end of file + From b739293676726725a751d7555efff2b808dfd6ad Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 10 Jan 2025 10:51:41 +0100 Subject: [PATCH 022/120] 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 8851c3b98e7eefc1406b05c92f235aff89d6d52e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 16 Jan 2025 09:04:32 +0100 Subject: [PATCH 023/120] Upgrade to Reactor 2024.0.2. Closes #2476 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index cdaf451e..9fa343f8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 5.14.2 1.13.14 5.1.0 - 2024.0.1 + 2024.0.2 2.2.21 3.1.10 1.10.0 From 85b23e5ce5e13eab8e3f22d011e518a3a0f58822 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 16 Jan 2025 09:05:21 +0100 Subject: [PATCH 024/120] Upgrade to Micrometer 1.14.3. Closes #2473 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9fa343f8..49b38f96 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,8 +119,8 @@ 1.9.25 1.9.0 1.5.12 - 1.14.2 - 1.4.1 + 1.14.3 + 1.4.2 5.14.2 1.13.14 5.1.0 From 9cf50695ef2664538e647966b26ac74d98271236 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 16 Jan 2025 15:26:47 +0100 Subject: [PATCH 025/120] Upgrade to Spring Framework 6.2.2. Closes #2477 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 49b38f96..a824c3c6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 3.1.10 1.10.0 2.0.2 - 6.2.1 + 6.2.2 src/main/antora/antora-playbook.yml 0.0.4 1.0.0-alpha.4 From 3fca802c2eaa7962363f841b524c5461d65f3519 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Jan 2025 11:37:18 +0100 Subject: [PATCH 026/120] Prepare 3.4.2 (2024.1.2). See #2444 --- parent/pom.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a824c3c6..4f3fa76e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,5 @@ - + + - 2024.1.2-SNAPSHOT + 2024.1.2 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.2-SNAPSHOT + 3.4.2 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 39513a6d8254128b3865245214ed1ccab9717eb8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Jan 2025 11:37:35 +0100 Subject: [PATCH 027/120] Release version 3.4.2 (2024.1.2). See #2444 --- 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 4f3fa76e..6130f649 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.2-SNAPSHOT + 3.4.2 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.2-SNAPSHOT + 3.4.2 zip true diff --git a/pom.xml b/pom.xml index 1f17a413..f2781ee6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.2-SNAPSHOT + 3.4.2 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 9002f70a..c5b7cccd 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.2-SNAPSHOT + 3.4.2 ../pom.xml From 2d6a9ec9a737bcf4d554ea71c052f900cdd54d61 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Jan 2025 11:39:58 +0100 Subject: [PATCH 028/120] Prepare next development iteration. See #2444 --- 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 6130f649..2ab8f713 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.2 + 3.4.3-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.2 + 3.4.3-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.2 + 3.4.3-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index f2781ee6..0342a4dd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.2 + 3.4.3-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index c5b7cccd..d547542d 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.2 + 3.4.3-SNAPSHOT ../pom.xml From 190e2bee22a4412e7a041451c166e60844d3b18c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Jan 2025 11:39:59 +0100 Subject: [PATCH 029/120] After release cleanups. See #2444 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2ab8f713..0407b0b5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.1.2 + 2024.1.3-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 0f3feceabaadcea933c44b91ac0e38613321f788 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 11 Feb 2025 15:20:20 +0100 Subject: [PATCH 030/120] 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 28a34f6a2fcedecb779737f532d25bd206b9dd47 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Feb 2025 14:21:46 +0100 Subject: [PATCH 031/120] Upgrade to Micrometer 1.14.4. Closes #2485 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0407b0b5..aef948b2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.9.0 1.5.12 - 1.14.3 - 1.4.2 + 1.14.4 + 1.4.3 5.14.2 1.13.14 5.1.0 From 0b87696f111f4ee101f4558fad5b82b8864edb6d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Feb 2025 14:22:04 +0100 Subject: [PATCH 032/120] Upgrade to Reactor 2024.0.3. Closes #2488 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index aef948b2..cfcf53ea 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.14.2 1.13.14 5.1.0 - 2024.0.2 + 2024.0.3 2.2.21 3.1.10 1.10.0 From cf43a5b078987a76b4cffcd5559e55bc87a271f9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Feb 2025 14:40:35 +0100 Subject: [PATCH 033/120] Upgrade to Spring Framework 6.2.3. Closes #2490 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index cfcf53ea..d500b0de 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ 3.1.10 1.10.0 2.0.2 - 6.2.2 + 6.2.3 src/main/antora/antora-playbook.yml 0.0.4 1.0.0-alpha.4 From 7ab63fb623d1d139df6abdde8766d9defddf92df Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 10:34:57 +0100 Subject: [PATCH 034/120] 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 0342a4dd..922d4d1f 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 221245ee8e87452a66519f1fcf29e73afceba03f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 10:39:44 +0100 Subject: [PATCH 035/120] Prepare 3.4.3 (2024.1.3). See #2479 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index d500b0de..939ae4ff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.1.3-SNAPSHOT + 2024.1.3 @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.3-SNAPSHOT + 3.4.3 zip true @@ -1499,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From fc86e646db35c419e81d15d885ecdd2909b324aa Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 10:40:04 +0100 Subject: [PATCH 036/120] Release version 3.4.3 (2024.1.3). See #2479 --- 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 939ae4ff..545a9840 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.3-SNAPSHOT + 3.4.3 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.3-SNAPSHOT + 3.4.3 zip true diff --git a/pom.xml b/pom.xml index 922d4d1f..374375cc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.3-SNAPSHOT + 3.4.3 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index d547542d..3329b9b8 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.3-SNAPSHOT + 3.4.3 ../pom.xml From f2b7dcb4e316586c9eb29adfe65c5f3c48ad20eb Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 10:42:41 +0100 Subject: [PATCH 037/120] Prepare next development iteration. See #2479 --- 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 545a9840..2e520afc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.3 + 3.4.4-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.3 + 3.4.4-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.3 + 3.4.4-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 374375cc..5ada1b84 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.3 + 3.4.4-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 3329b9b8..c6123caa 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.3 + 3.4.4-SNAPSHOT ../pom.xml From 0dcb6a1b5304a9f71cc81e90cec4d77226c39f24 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 10:42:42 +0100 Subject: [PATCH 038/120] After release cleanups. See #2479 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2e520afc..5352fcac 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.1.3 + 2024.1.4-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From e97159a5c8cdaca90d60e593f350386d356a980f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 12:16:43 +0100 Subject: [PATCH 039/120] 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 7948b451f3b25c67b01a0d0aaa9e8626be07c543 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 11 Mar 2025 09:02:18 +0100 Subject: [PATCH 040/120] Upgrade to Testcontainers 1.20.6. See #2513 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5352fcac..cee215c8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.1.4-SNAPSHOT + 2024.1.4 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.4-SNAPSHOT + 3.4.4 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 12bb78fb5f904ba33ea236ab47297636b58156a9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Mar 2025 08:17:34 +0100 Subject: [PATCH 047/120] Release version 3.4.4 (2024.1.4). See #2497 --- 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 77e9e2b1..a48b752d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.4-SNAPSHOT + 3.4.4 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.4-SNAPSHOT + 3.4.4 zip true diff --git a/pom.xml b/pom.xml index 5ada1b84..f18129b6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.4-SNAPSHOT + 3.4.4 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index c6123caa..8da0c6b2 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.4-SNAPSHOT + 3.4.4 ../pom.xml From 51d69396a9b8760585f45bd04bc2c9f842ca538c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Mar 2025 08:20:01 +0100 Subject: [PATCH 048/120] Prepare next development iteration. See #2497 --- 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 a48b752d..7d5927cd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.4 + 3.4.5-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.4 + 3.4.5-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.4 + 3.4.5-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index f18129b6..8b0275db 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.4 + 3.4.5-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 8da0c6b2..25d8775d 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.4 + 3.4.5-SNAPSHOT ../pom.xml From 3cd47656bfeaa8837d76b94e27b2bd7ac85d0f3b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Mar 2025 08:20:02 +0100 Subject: [PATCH 049/120] After release cleanups. See #2497 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7d5927cd..fdbb105a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.1.4 + 2024.1.5-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 03ddec0f8521cbb6d4e16916166f1cba75687f40 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 17 Apr 2025 08:58:20 +0200 Subject: [PATCH 050/120] Upgrade to AspectJ 1.9.24. See #2543 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index fdbb105a..c290da18 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.1.5-SNAPSHOT + 2024.1.5 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.5-SNAPSHOT + 3.4.5 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 88e8b74bb7e182c3bf499442ef8a79f33672c8c1 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Apr 2025 10:45:18 +0200 Subject: [PATCH 056/120] Release version 3.4.5 (2024.1.5). See #2519 --- 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 86cf240e..76158035 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.5-SNAPSHOT + 3.4.5 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.5-SNAPSHOT + 3.4.5 zip true diff --git a/pom.xml b/pom.xml index 8b0275db..10284099 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.5-SNAPSHOT + 3.4.5 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 25d8775d..bf51dd76 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.5-SNAPSHOT + 3.4.5 ../pom.xml From b14668bae4efd1cb62064034307b1060e2501fd4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Apr 2025 10:47:45 +0200 Subject: [PATCH 057/120] Prepare next development iteration. See #2519 --- 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 76158035..7baa987e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.5 + 3.4.6-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.5 + 3.4.6-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.5 + 3.4.6-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 10284099..9162e8d3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.5 + 3.4.6-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index bf51dd76..39f20285 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.5 + 3.4.6-SNAPSHOT ../pom.xml From f0e430e2fd0e2f4d404bdaa34739ca6ba5154053 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Apr 2025 10:47:46 +0200 Subject: [PATCH 058/120] After release cleanups. See #2519 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7baa987e..7304f7e7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.1.5 + 2024.1.6-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From f692d7aed625340cf9c75e69c333e504639b4fb7 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 12 May 2025 08:55:25 +0200 Subject: [PATCH 059/120] Upgrade build to Java 24.0.1. Closes #2563 --- ci/pipeline.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.properties b/ci/pipeline.properties index cd2fcf7f..decdfc5e 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,6 +1,6 @@ # Java versions java.main.tag=17.0.13_11-jdk-focal -java.next.tag=23.0.1_11-jdk-noble +java.next.tag=24.0.1_9-jdk-noble # Docker container images - standard docker.java.main.image=library/eclipse-temurin:${java.main.tag} From 405229ace928701f4ac5231635af61b58afdb7a5 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 12 May 2025 08:58:49 +0200 Subject: [PATCH 060/120] 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 decdfc5e..7b01602c 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=24.0.1_9-jdk-noble # Docker container images - standard From 595467e2fc944c39ed91b2a296a5d181da68aae8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 12 May 2025 09:03:32 +0200 Subject: [PATCH 061/120] Upgrade to Jackson 2.18.4. See #2565 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7304f7e7..b0748b8a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.1.6-SNAPSHOT + 2024.1.6 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.6-SNAPSHOT + 3.4.6 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 361f07da6b3395a93683b958976813b083997ccc Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 May 2025 10:48:33 +0200 Subject: [PATCH 066/120] Release version 3.4.6 (2024.1.6). See #2549 --- 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 2c8db4b4..bb4e8124 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.6-SNAPSHOT + 3.4.6 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.6-SNAPSHOT + 3.4.6 zip true diff --git a/pom.xml b/pom.xml index 9162e8d3..fb9f1e2a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.6-SNAPSHOT + 3.4.6 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 39f20285..9027b05e 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.6-SNAPSHOT + 3.4.6 ../pom.xml From a5e907b415e4fc82d6cee87b4236bba36f06cee8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 May 2025 10:51:18 +0200 Subject: [PATCH 067/120] Prepare next development iteration. See #2549 --- 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 bb4e8124..ec81c712 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.6 + 3.4.7-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.6 + 3.4.7-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.6 + 3.4.7-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index fb9f1e2a..fb7aaeba 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.6 + 3.4.7-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 9027b05e..526849c3 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.6 + 3.4.7-SNAPSHOT ../pom.xml From ee4ba03b00630945fa272856b956d2001293eb88 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 16 May 2025 10:51:19 +0200 Subject: [PATCH 068/120] After release cleanups. See #2549 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ec81c712..cb07ff85 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.1.6 + 2024.1.7-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 93bbd94577400735a2ce38e8dfd8ae5588f02b78 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 11 Jun 2025 14:08:40 +0200 Subject: [PATCH 069/120] Upgrade to Project Reactor 2024.0.7. Closes #2584 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index cb07ff85..2b3001a8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.14.2 1.13.17 5.1.0 - 2024.0.6 + 2024.0.7 2.2.21 3.1.10 1.10.0 From 2f8c73efd3c4fcd9da41abb615844830002b2505 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 11 Jun 2025 14:10:12 +0200 Subject: [PATCH 070/120] Upgrade to Micrometer 1.14.8. Closes #2586 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2b3001a8..18eff8f1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.9.0 1.5.12 - 1.14.7 - 1.4.6 + 1.14.8 + 1.4.7 5.14.2 1.13.17 5.1.0 From 2cdc81b8c6e50ead788cc9fa6f54d05282949030 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 11 Jun 2025 14:16:11 +0200 Subject: [PATCH 071/120] Upgrade to Jackson 2.18.4.1. See #2588 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 18eff8f1..30882638 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.1.7-SNAPSHOT + 2024.1.7 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.7-SNAPSHOT + 3.4.7 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 53642735632d6f5e30f1cb779ee84c7a9cfbbc92 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 13 Jun 2025 11:15:16 +0200 Subject: [PATCH 074/120] Release version 3.4.7 (2024.1.7). See #2576 --- 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 0a37c218..75240421 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.7-SNAPSHOT + 3.4.7 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.7-SNAPSHOT + 3.4.7 zip true diff --git a/pom.xml b/pom.xml index fb7aaeba..b8494977 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.7-SNAPSHOT + 3.4.7 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 526849c3..6c8b40ad 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.7-SNAPSHOT + 3.4.7 ../pom.xml From 8a79412cfb71557aa4bc8ccfdcc83496cbbfd990 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 13 Jun 2025 11:17:51 +0200 Subject: [PATCH 075/120] Prepare next development iteration. See #2576 --- 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 75240421..49556276 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.7 + 3.4.8-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.7 + 3.4.8-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.7 + 3.4.8-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index b8494977..28fc016c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.7 + 3.4.8-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 6c8b40ad..2dccf831 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.7 + 3.4.8-SNAPSHOT ../pom.xml From f0ab34b080230d4ca2513b7ed38ee856fe24fd9a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 13 Jun 2025 11:17:52 +0200 Subject: [PATCH 076/120] After release cleanups. See #2576 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 49556276..42593013 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.1.7 + 2024.1.8-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 0a5f6362237737fc3b05848a286a87a8c06c12fe Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 17 Jun 2025 09:23:54 +0200 Subject: [PATCH 077/120] Polishing. Update readme. See #2578 --- README.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 2d48eacc..3bf20072 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -= Spring Data Build Infrastructure image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-build%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-build/] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Build"] += Spring Data Build Infrastructure image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Build"] This repository contains common infrastructure to be used by Spring Data modules that build with Maven. It consists of a _resources_ project that bundles up resources that are needed during the build CSS for reference documentation generation and JavaDoc. The second project is _parent_ that can be used as parent project to pre-configure core dependencies, properties, reference documentation generation and most important of all the appropriate distribution assembly. @@ -65,7 +65,7 @@ As an example have a look at the build of https://github.com/spring-projects/spr === Multi project setup -A multi module setup requires slightly more setup and some structure being set up. +A multi-module setup requires slightly more setup and some structure being set up. * The root `pom.xml` needs to configure the `project.type` property to `multi`. * Asciidoc documentation sources need to be in the root project. @@ -83,7 +83,7 @@ As an example have a look at the build of https://github.com/spring-projects/spr == Additional build profiles * `ci` - Packages the JavaDoc as JAR for distribution (needs to be active on the CI server to make sure we distribute JavaDoc as JAR). -* `distribute` - Creates Asciidoc documentation. +* `antora` - Creates Antora documentation. * `distribute-schema` - Creates schema file distribution. * `spring…-next` - Configures the Spring version to be used to be the next Spring Framework snapshot version. From 72bd2377e88a88a2ee5019d115da54a7f0454a00 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 14 Jul 2025 08:30:42 +0200 Subject: [PATCH 078/120] Upgrade to Micrometer 1.14.9. Closes #2602 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 42593013..92b96281 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.9.0 1.5.12 - 1.14.8 - 1.4.7 + 1.14.9 + 1.4.8 5.14.2 1.13.17 5.1.0 From f05867337c217bb772722d2b24d863d4063399ce Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 14 Jul 2025 08:37:06 +0200 Subject: [PATCH 079/120] Upgrade to RxJava 3.1.11. See #2606 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 92b96281..2840d607 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.1.8-SNAPSHOT + 2024.1.8 @@ -414,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.8-SNAPSHOT + 3.4.8 zip true @@ -1498,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From 35472bd793beef67c06f7db23148e436d321e35c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Jul 2025 09:31:52 +0200 Subject: [PATCH 084/120] Release version 3.4.8 (2024.1.8). See #2591 --- 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 5f37c115..322f5337 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.8-SNAPSHOT + 3.4.8 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.8-SNAPSHOT + 3.4.8 zip true diff --git a/pom.xml b/pom.xml index 28fc016c..6b358656 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.8-SNAPSHOT + 3.4.8 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 2dccf831..a189dd80 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.8-SNAPSHOT + 3.4.8 ../pom.xml From 17442b9731508eaf8fcba3080b5df7e95429396d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Jul 2025 09:34:20 +0200 Subject: [PATCH 085/120] Prepare next development iteration. See #2591 --- 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 322f5337..b4a6aecb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.8 + 3.4.9-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.8 + 3.4.9-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.8 + 3.4.9-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 6b358656..50faf98d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.8 + 3.4.9-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index a189dd80..427d09f3 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.8 + 3.4.9-SNAPSHOT ../pom.xml From dac9a10f0554c5a2bb05e717332c27f9aa2ac916 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Jul 2025 09:34:22 +0200 Subject: [PATCH 086/120] After release cleanups. See #2591 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b4a6aecb..b94011ec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.1.8 + 2024.1.9-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 6ecccc9c27a47205c438709a1ec738c358dfcff0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 13 Aug 2025 11:51:35 +0200 Subject: [PATCH 087/120] Upgrade to Project Reactor 2024.0.9. Closes #2623 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b94011ec..4e634d06 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.14.2 1.13.17 5.1.0 - 2024.0.8 + 2024.0.9 2.2.21 3.1.11 1.10.0 From 71dd607b81d06ca7a1997647c99d943a2a0018ac Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 13 Aug 2025 11:53:10 +0200 Subject: [PATCH 088/120] Upgrade to Micrometer 1.14.10. Closes #2631 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4e634d06..634c3414 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.9.0 1.5.12 - 1.14.9 - 1.4.8 + 1.14.10 + 1.4.9 5.14.2 1.13.17 5.1.0 From 009803c63439df343f70a86e48032d785b7d2def Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Aug 2025 14:32:27 +0200 Subject: [PATCH 089/120] Upgrade to Spring Framework 6.2.10. Closes #2625 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 634c3414..0d4e1b2d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ 3.1.11 1.10.0 2.0.2 - 6.2.9 + 6.2.10 src/main/antora/antora-playbook.yml 0.0.4 1.0.0-alpha.4 @@ -908,7 +908,7 @@ spring6-next - 6.2.10-SNAPSHOT + 6.2.11-SNAPSHOT From c03217291af5aaba99fe035d55bd0725877d0b40 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Aug 2025 17:37:48 +0200 Subject: [PATCH 090/120] Refine version properties for documentation. See #2620 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0d4e1b2d..67c245d2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -303,7 +303,7 @@ ${springdata.commons} - + From 2840e044d2e440c50a1735dee0a37941318460b3 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Aug 2025 08:38:21 +0200 Subject: [PATCH 091/120] Prepare 3.4.9 (2024.1.9). See #2618 --- parent/pom.xml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 67c245d2..b1f6d0c5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,4 +1,4 @@ - + - 2024.1.9-SNAPSHOT + 2024.1.9 @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.9-SNAPSHOT + 3.4.9 zip true @@ -1499,20 +1499,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From dd1d23f323f0850b2ed3a815ed28e0e36a8943a7 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Aug 2025 08:38:41 +0200 Subject: [PATCH 092/120] Release version 3.4.9 (2024.1.9). See #2618 --- 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 b1f6d0c5..827583b6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.9-SNAPSHOT + 3.4.9 ../pom.xml @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.9-SNAPSHOT + 3.4.9 zip true diff --git a/pom.xml b/pom.xml index 50faf98d..0e4eb4b5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.9-SNAPSHOT + 3.4.9 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 427d09f3..8830d629 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.9-SNAPSHOT + 3.4.9 ../pom.xml From 5368364770622850f186978cce0df334855b7f06 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Aug 2025 08:41:13 +0200 Subject: [PATCH 093/120] Prepare next development iteration. See #2618 --- 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 827583b6..bad0a286 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.9 + 3.4.10-SNAPSHOT ../pom.xml @@ -415,7 +415,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.9 + 3.4.10-SNAPSHOT zip true @@ -723,7 +723,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.9 + 3.4.10-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 0e4eb4b5..ca8d53c5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.9 + 3.4.10-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 8830d629..ab1df159 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.9 + 3.4.10-SNAPSHOT ../pom.xml From b24d7c37296a4229394aa9e74e3fab9fe6822d0b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Aug 2025 08:41:14 +0200 Subject: [PATCH 094/120] After release cleanups. See #2618 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index bad0a286..bd4dd425 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,7 +144,7 @@ 4.0.3 - 2024.1.9 + 2024.1.10-SNAPSHOT @@ -1499,8 +1499,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 788cb19f161d9ed92954c6619655b2484f7eeda4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Aug 2025 12:07:35 +0200 Subject: [PATCH 095/120] Refine version properties for documentation build. Closes #2638 --- parent/pom.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index bd4dd425..10b4461e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -132,6 +132,8 @@ 2.0.2 6.2.10 src/main/antora/antora-playbook.yml + https://docs.spring.io + ${documentation.baseurl}/spring-framework/docs/${spring}/javadoc-api 0.0.4 1.0.0-alpha.4 0.0.7 @@ -291,7 +293,7 @@ ${spring} - + @@ -303,7 +305,7 @@ ${springdata.commons} - + @@ -621,8 +623,8 @@ ${project.version} ${aspectj} ${querydsl} - https://docs.spring.io/spring-framework/docs/${spring}/reference/html/ - https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api/ + ${antora.baseurl}/spring-framework/reference/${spring} + ${antora.spring-javadoc-url}/ ${spring} ${spring-hateoas} ${releasetrain} @@ -1463,10 +1465,10 @@ true html,reference - https://docs.spring.io/spring/docs/${spring}/javadoc-api/ - https://docs.spring.io/spring-data/commons/docs/current/api/ - https://docs.spring.io/spring-data/keyvalue/docs/current/api/ - https://docs.spring.io/spring-hateoas/docs/current/api/ + ${documentation.spring-javadoc-url} + ${documentation.baseurl}/spring-data/commons/docs/current/api/ + ${documentation.baseurl}/spring-data/keyvalue/docs/current/api/ + ${documentation.baseurl}/spring-hateoas/docs/current/api/ https://docs.oracle.com/en/java/javase/17/docs/api/ From 1c692433664aeab82b1b4b98fefa12753359b9f3 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Thu, 11 Sep 2025 16:21:19 +0200 Subject: [PATCH 096/120] Upgrade to Micrometer Tracing 1.4.10. See #2659 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 10b4461e..17be8d13 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - + - 2024.1.10-SNAPSHOT + 2024.1.10 @@ -416,7 +417,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.10-SNAPSHOT + 3.4.10 zip true @@ -1500,20 +1501,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + - \ No newline at end of file + From 790cc966cce588a10a8e4bdabd35ac7519a3b9b3 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 12 Sep 2025 10:53:27 +0200 Subject: [PATCH 101/120] Release version 3.4.10 (2024.1.10). See #2635 --- 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 5e4f17e7..f9b4f985 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.10-SNAPSHOT + 3.4.10 ../pom.xml @@ -725,7 +725,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.10-SNAPSHOT + 3.4.10 zip true diff --git a/pom.xml b/pom.xml index ca8d53c5..e69a0f08 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.10-SNAPSHOT + 3.4.10 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index ab1df159..fac1a713 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.10-SNAPSHOT + 3.4.10 ../pom.xml From f43e9a4b1424735a44832c18f6556ab5bc605413 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 12 Sep 2025 10:57:09 +0200 Subject: [PATCH 102/120] Prepare next development iteration. See #2635 --- 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 f9b4f985..4261e23c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.10 + 3.4.11-SNAPSHOT ../pom.xml @@ -417,7 +417,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.10 + 3.4.11-SNAPSHOT zip true @@ -725,7 +725,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.10 + 3.4.11-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index e69a0f08..9c4936dc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.10 + 3.4.11-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index fac1a713..cc8b711b 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.10 + 3.4.11-SNAPSHOT ../pom.xml From 9761f07597eea0d7a495ec8d499e7b0521b4098c Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 12 Sep 2025 10:57:10 +0200 Subject: [PATCH 103/120] After release cleanups. See #2635 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4261e23c..f88913b3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -146,7 +146,7 @@ 4.0.3 - 2024.1.10 + 2024.1.11-SNAPSHOT @@ -1501,8 +1501,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 513348965f9e3d98891d9112c65fb0c31d44e49c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 23 Sep 2025 10:40:12 +0200 Subject: [PATCH 104/120] Add CodeQL scanning. Closes #2664 --- .github/workflows/project.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml index a5f76457..4c8108d3 100644 --- a/.github/workflows/project.yml +++ b/.github/workflows/project.yml @@ -10,6 +10,11 @@ on: pull_request_target: types: [opened, edited, reopened] +permissions: + contents: read + issues: write + pull-requests: write + jobs: Inbox: runs-on: ubuntu-latest From 6278881d7f042196c87d04c392fdaf8a52e22889 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 23 Sep 2025 10:50:41 +0200 Subject: [PATCH 105/120] Add CodeQL scanning. Closes #2664 --- .github/workflows/codeql.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 00000000..411d4a93 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,21 @@ +# GitHub Actions for CodeQL Scanning + +name: "CodeQL Advanced" + +on: + push: + pull_request: + workflow_dispatch: + schedule: + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#schedule + - cron: '0 5 * * *' + +permissions: read-all + +jobs: + codeql-analysis-call: + permissions: + actions: read + contents: read + security-events: write + uses: spring-io/github-actions/.github/workflows/codeql-analysis.yml@1 From 0b0bfe28907ca3ca0848e2fe44f6b47c59355150 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 15 Oct 2025 08:10:14 +0200 Subject: [PATCH 106/120] Upgrade to Micrometer 1.14.12. Closes: #2674 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f88913b3..0917b2a2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.9.0 1.5.12 - 1.14.11 - 1.4.10 + 1.14.12 + 1.4.11 5.14.2 1.13.17 5.1.0 From 54773d284c9c6491b84883ae73a25b265bdcc889 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 15 Oct 2025 08:10:47 +0200 Subject: [PATCH 107/120] Upgrade to Project Reactor 2024.0.11. Closes: #2675 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0917b2a2..8071de06 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.14.2 1.13.17 5.1.0 - 2024.0.10 + 2024.0.11 2.2.21 3.1.11 1.10.0 From 7307aa08525c416053b72eca9a4c7571eeeea278 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 15 Oct 2025 09:15:33 +0200 Subject: [PATCH 108/120] Upgrade to RxJava 3.1.12. Closes: #2677 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8071de06..cbd0db4c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -127,7 +127,7 @@ 5.1.0 2024.0.11 2.2.21 - 3.1.11 + 3.1.12 1.10.0 2.0.2 6.2.11 From 37870e9dc6af89037a88d63a48e04b15c24ae84f Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Thu, 16 Oct 2025 11:39:10 +0200 Subject: [PATCH 109/120] Upgrade to Spring Framework 6.2.12. Closes: #2678 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index cbd0db4c..a628a76a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ 3.1.12 1.10.0 2.0.2 - 6.2.11 + 6.2.12 src/main/antora/antora-playbook.yml https://docs.spring.io ${documentation.baseurl}/spring-framework/docs/${spring}/javadoc-api From a3978b87693a8ce6788cf2a4bcc98cd37681c466 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 17 Oct 2025 10:24:43 +0200 Subject: [PATCH 110/120] Prepare 3.4.11 (2024.1.11). See #2661 --- parent/pom.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a628a76a..ecdcc344 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -146,7 +146,7 @@ 4.0.3 - 2024.1.11-SNAPSHOT + 2024.1.11 @@ -417,7 +417,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.11-SNAPSHOT + 3.4.11 zip true @@ -1501,20 +1501,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + From ddb45d3076b10aa0aea5c3743f34bf2b9ce79ef6 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 17 Oct 2025 10:26:04 +0200 Subject: [PATCH 111/120] Release version 3.4.11 (2024.1.11). See #2661 --- 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 ecdcc344..b2c411a8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.11-SNAPSHOT + 3.4.11 ../pom.xml @@ -725,7 +725,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.11-SNAPSHOT + 3.4.11 zip true diff --git a/pom.xml b/pom.xml index 9c4936dc..12fef5c6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.11-SNAPSHOT + 3.4.11 pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index cc8b711b..89446458 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.11-SNAPSHOT + 3.4.11 ../pom.xml From 33d2aad351d68fd244b969d62fd9dcc706b01a3b Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 17 Oct 2025 10:31:07 +0200 Subject: [PATCH 112/120] Prepare next development iteration. See #2661 --- 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 b2c411a8..752fd4bb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.springframework.data.build spring-data-build - 3.4.11 + 3.4.12-SNAPSHOT ../pom.xml @@ -417,7 +417,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.11 + 3.4.12-SNAPSHOT zip true @@ -725,7 +725,7 @@ org.springframework.data.build spring-data-build-resources - 3.4.11 + 3.4.12-SNAPSHOT zip true diff --git a/pom.xml b/pom.xml index 12fef5c6..05531b5d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.data.build spring-data-build - 3.4.11 + 3.4.12-SNAPSHOT pom Spring Data Build diff --git a/resources/pom.xml b/resources/pom.xml index 89446458..2c9ccdb1 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-build - 3.4.11 + 3.4.12-SNAPSHOT ../pom.xml From 6fe54455e0e1d914b9b64baf3b0ad84fb6ba9b4a Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 17 Oct 2025 10:31:09 +0200 Subject: [PATCH 113/120] After release cleanups. See #2661 --- parent/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 752fd4bb..43033dff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -146,7 +146,7 @@ 4.0.3 - 2024.1.11 + 2024.1.12-SNAPSHOT @@ -1501,8 +1501,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 7cea37013e99f1d032d51f21c3a3b9e5ed8d654b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 28 Oct 2025 08:37:35 +0100 Subject: [PATCH 114/120] Upgrade to Logback 1.5.20. Closes #2687 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 43033dff..ba896c1c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -119,7 +119,7 @@ 5.11.4 1.9.25 1.9.0 - 1.5.12 + 1.5.20 1.14.12 1.4.11 5.14.2 @@ -129,7 +129,7 @@ 2.2.21 3.1.12 1.10.0 - 2.0.2 + 2.0.17 6.2.12 src/main/antora/antora-playbook.yml https://docs.spring.io From 85a7a521ad0bc6b265e327ab7980c066d2a87366 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 31 Oct 2025 09:48:16 +0100 Subject: [PATCH 115/120] Reformat pom. More consistent formatting. See #2686 --- parent/pom.xml | 64 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ba896c1c..a6f682ec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -154,11 +154,9 @@ - - ci @@ -214,20 +212,19 @@ - - - - + pre-release + + org.apache.maven.plugins maven-enforcer-plugin @@ -261,14 +258,18 @@ + + antora-process-resources + + io.spring.maven.antora antora-component-version-maven-plugin @@ -326,6 +327,7 @@ + antora @@ -335,9 +337,10 @@ true true - + + org.jetbrains.kotlin @@ -355,10 +358,12 @@ true + + io.spring.maven.antora antora-maven-plugin @@ -375,6 +380,7 @@ + org.antora antora-maven-plugin @@ -391,6 +397,7 @@ + @@ -401,7 +408,6 @@ - distribute @@ -424,7 +430,6 @@ - @@ -448,7 +453,6 @@ - org.apache.maven.plugins maven-dependency-plugin @@ -473,7 +477,6 @@ - org.apache.maven.plugins maven-javadoc-plugin @@ -579,7 +582,6 @@ - org.asciidoctor asciidoctor-maven-plugin @@ -659,7 +661,6 @@ - org.jfrog.buildinfo artifactory-maven-plugin @@ -698,10 +699,10 @@ + - @@ -709,7 +710,6 @@ - distribute-schema @@ -732,7 +732,6 @@ - @@ -756,7 +755,6 @@ - org.apache.maven.plugins maven-dependency-plugin @@ -783,7 +781,6 @@ Depended on by the site.xml assembly descriptor. Conditional execution if schemas are present. --> - org.apache.maven.plugins maven-antrun-plugin @@ -862,7 +859,6 @@ - org.jfrog.buildinfo artifactory-maven-plugin @@ -901,6 +897,7 @@ + @@ -908,10 +905,12 @@ + spring6-next 6.2.11-SNAPSHOT + spring-snapshot @@ -924,7 +923,9 @@ + jackson-next + 2.15.2 @@ -940,7 +941,9 @@ + jmh + com.github.mp911de.microbenchmark-runner @@ -949,6 +952,7 @@ test + jitpack.io @@ -1132,7 +1136,6 @@ --> - @@ -1272,7 +1275,6 @@ - @@ -1296,6 +1298,7 @@ + compile compile @@ -1309,6 +1312,7 @@ + test-compile test-compile @@ -1322,6 +1326,7 @@ + jmh-compile test-compile @@ -1335,6 +1340,7 @@ + @@ -1346,14 +1352,17 @@ ${source.level} + default-compile none + default-testCompile none + java-compile compile @@ -1361,6 +1370,7 @@ compile + java-test-compile test-compile @@ -1368,6 +1378,7 @@ testCompile + @@ -1425,6 +1436,7 @@ org.codehaus.mojo build-helper-maven-plugin + add-jmh-source generate-test-sources @@ -1437,6 +1449,7 @@ + add-kotlin-source prepare-package @@ -1449,6 +1462,7 @@ + From 409ea69187f3d2add411a1f3b824910f81b7f7f8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 10 Nov 2025 09:40:23 +0100 Subject: [PATCH 116/120] Upgrade to Micrometer 1.14.13. Closes #2706 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a6f682ec..95b8f7e8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ 1.9.25 1.9.0 1.5.20 - 1.14.12 - 1.4.11 + 1.14.13 + 1.4.12 5.14.2 1.13.17 5.1.0 From 060514f1afd69dbb53dbcfb3827f86ece7b2ee6b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 10 Nov 2025 09:40:38 +0100 Subject: [PATCH 117/120] Upgrade to Project Reactor 2024.0.12. Closes #2705 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 95b8f7e8..a9cf1f45 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 5.14.2 1.13.17 5.1.0 - 2024.0.11 + 2024.0.12 2.2.21 3.1.12 1.10.0 From d51d0816622f0ad2c30dd8b50179e94985074442 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 10 Nov 2025 11:24:06 +0100 Subject: [PATCH 118/120] Upgrade to AspectJ 1.9.25. See #2707 --- parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a9cf1f45..257d46b4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,4 @@ - - +