From 5c8a225565d04fd44ed928986d183d2ee1cf502c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 May 2024 11:51:48 +0200 Subject: [PATCH 01/80] Prepare next development iteration. See #2382 --- pom.xml | 2 +- spring-data-rest-core/pom.xml | 2 +- spring-data-rest-distribution/pom.xml | 2 +- spring-data-rest-hal-explorer/pom.xml | 2 +- spring-data-rest-tests/pom.xml | 2 +- spring-data-rest-tests/spring-data-rest-tests-core/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml | 4 ++-- .../spring-data-rest-tests-security/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml | 2 +- spring-data-rest-webmvc/pom.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index e81b8be4e..5b37d3b38 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.0 + 4.3.1-SNAPSHOT pom Spring Data REST diff --git a/spring-data-rest-core/pom.xml b/spring-data-rest-core/pom.xml index ae4b39e10..4573c459a 100644 --- a/spring-data-rest-core/pom.xml +++ b/spring-data-rest-core/pom.xml @@ -11,7 +11,7 @@ org.springframework.data spring-data-rest-parent - 4.3.0 + 4.3.1-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-distribution/pom.xml b/spring-data-rest-distribution/pom.xml index fd4266023..db1834af0 100644 --- a/spring-data-rest-distribution/pom.xml +++ b/spring-data-rest-distribution/pom.xml @@ -13,7 +13,7 @@ org.springframework.data spring-data-rest-parent - 4.3.0 + 4.3.1-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml index 82ce0ac78..c2e9089f8 100644 --- a/spring-data-rest-hal-explorer/pom.xml +++ b/spring-data-rest-hal-explorer/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.0 + 4.3.1-SNAPSHOT spring-data-rest-hal-explorer diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml index 5e41a7d7c..88e540895 100644 --- a/spring-data-rest-tests/pom.xml +++ b/spring-data-rest-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.0 + 4.3.1-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml index fb217c0ff..f68118bf2 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.0 + 4.3.1-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-webmvc - 4.3.0 + 4.3.1-SNAPSHOT diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml index 4b258a39e..6e8985098 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.0 + 4.3.1-SNAPSHOT ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.0 + 4.3.1-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml index cc8059697..12540882b 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.0 + 4.3.1-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.0 + 4.3.1-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml index aa3c60457..955ef6c98 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.0 + 4.3.1-SNAPSHOT ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.0 + 4.3.1-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml index e39b9d4ac..2165688b7 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml @@ -4,7 +4,7 @@ org.springframework.data spring-data-rest-tests - 4.3.0 + 4.3.1-SNAPSHOT Spring Data REST Tests - Shop spring-data-rest-tests-shop diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml index 1cf5e6069..884608b36 100644 --- a/spring-data-rest-webmvc/pom.xml +++ b/spring-data-rest-webmvc/pom.xml @@ -12,7 +12,7 @@ org.springframework.data spring-data-rest-parent - 4.3.0 + 4.3.1-SNAPSHOT ../pom.xml From 8ef33daa2324e6823d1666a2a9f04e10fc62d637 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 May 2024 11:51:49 +0200 Subject: [PATCH 02/80] After release cleanups. See #2382 --- Jenkinsfile | 2 +- pom.xml | 26 +++++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f8e2d607f..3f940de73 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { triggers { pollSCM 'H/10 * * * *' - upstream(upstreamProjects: "spring-hateoas/main,spring-data-commons/main", threshold: hudson.model.Result.SUCCESS) + upstream(upstreamProjects: "spring-hateoas/2.3.x,spring-data-commons/3.3.x", threshold: hudson.model.Result.SUCCESS) } options { diff --git a/pom.xml b/pom.xml index 5b37d3b38..97490155b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.data.build spring-data-parent - 3.3.0 + 3.3.1-SNAPSHOT @@ -28,10 +28,10 @@ multi spring-data-rest - 3.3.0 - 3.3.0 - 4.3.0 - 3.3.0 + 3.3.1-SNAPSHOT + 3.3.1-SNAPSHOT + 4.3.1-SNAPSHOT + 3.3.1-SNAPSHOT 6.5.0.CR1 @@ -136,8 +136,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 8c2da3f9bcca971f10ab6bce3d8682c3c3cf29a6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:45:24 +0200 Subject: [PATCH 03/80] Prepare 4.3.1 (2024.0.1). See #2386 --- pom.xml | 26 +++++++------------------- src/main/resources/notice.txt | 3 ++- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 97490155b..12c6fd28a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.data.build spring-data-parent - 3.3.1-SNAPSHOT + 3.3.1 @@ -28,10 +28,10 @@ multi spring-data-rest - 3.3.1-SNAPSHOT - 3.3.1-SNAPSHOT - 4.3.1-SNAPSHOT - 3.3.1-SNAPSHOT + 3.3.1 + 3.3.1 + 4.3.1 + 3.3.1 6.5.0.CR1 @@ -136,20 +136,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt index 8051d5cf8..d8e76ad37 100644 --- a/src/main/resources/notice.txt +++ b/src/main/resources/notice.txt @@ -1,4 +1,4 @@ -Spring Data REST 4.3 GA (2024.0.0) +Spring Data REST 4.3.1 (2024.0.1) Copyright (c) 2012-2019 Pivotal Software, Inc. This product is licensed to you under the Apache License, Version 2.0 @@ -54,5 +54,6 @@ subcomponent's license, as noted in the license.txt file. + From 4aef47504d85ff27526ca9cedee92ac52d7f445f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:45:40 +0200 Subject: [PATCH 04/80] Release version 4.3.1 (2024.0.1). See #2386 --- pom.xml | 2 +- spring-data-rest-core/pom.xml | 2 +- spring-data-rest-distribution/pom.xml | 2 +- spring-data-rest-hal-explorer/pom.xml | 2 +- spring-data-rest-tests/pom.xml | 2 +- spring-data-rest-tests/spring-data-rest-tests-core/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml | 4 ++-- .../spring-data-rest-tests-security/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml | 2 +- spring-data-rest-webmvc/pom.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 12c6fd28a..94a27941d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1-SNAPSHOT + 4.3.1 pom Spring Data REST diff --git a/spring-data-rest-core/pom.xml b/spring-data-rest-core/pom.xml index 4573c459a..389fda547 100644 --- a/spring-data-rest-core/pom.xml +++ b/spring-data-rest-core/pom.xml @@ -11,7 +11,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1-SNAPSHOT + 4.3.1 ../pom.xml diff --git a/spring-data-rest-distribution/pom.xml b/spring-data-rest-distribution/pom.xml index db1834af0..535a4f3b3 100644 --- a/spring-data-rest-distribution/pom.xml +++ b/spring-data-rest-distribution/pom.xml @@ -13,7 +13,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1-SNAPSHOT + 4.3.1 ../pom.xml diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml index c2e9089f8..562116181 100644 --- a/spring-data-rest-hal-explorer/pom.xml +++ b/spring-data-rest-hal-explorer/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1-SNAPSHOT + 4.3.1 spring-data-rest-hal-explorer diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml index 88e540895..059866a29 100644 --- a/spring-data-rest-tests/pom.xml +++ b/spring-data-rest-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1-SNAPSHOT + 4.3.1 ../pom.xml diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml index f68118bf2..39d994982 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1-SNAPSHOT + 4.3.1 ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-webmvc - 4.3.1-SNAPSHOT + 4.3.1 diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml index 6e8985098..4b0db02f6 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1-SNAPSHOT + 4.3.1 ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.1-SNAPSHOT + 4.3.1 test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml index 12540882b..e5c002a81 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1-SNAPSHOT + 4.3.1 ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.1-SNAPSHOT + 4.3.1 test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml index 955ef6c98..3f950726a 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1-SNAPSHOT + 4.3.1 ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.1-SNAPSHOT + 4.3.1 test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml index 2165688b7..8c64a5429 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml @@ -4,7 +4,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1-SNAPSHOT + 4.3.1 Spring Data REST Tests - Shop spring-data-rest-tests-shop diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml index 884608b36..2c2e51b18 100644 --- a/spring-data-rest-webmvc/pom.xml +++ b/spring-data-rest-webmvc/pom.xml @@ -12,7 +12,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1-SNAPSHOT + 4.3.1 ../pom.xml From ce3d7d4e17d0e2954f0c0d14a916e4004886e1cd Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:47:58 +0200 Subject: [PATCH 05/80] Prepare next development iteration. See #2386 --- pom.xml | 2 +- spring-data-rest-core/pom.xml | 2 +- spring-data-rest-distribution/pom.xml | 2 +- spring-data-rest-hal-explorer/pom.xml | 2 +- spring-data-rest-tests/pom.xml | 2 +- spring-data-rest-tests/spring-data-rest-tests-core/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml | 4 ++-- .../spring-data-rest-tests-security/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml | 2 +- spring-data-rest-webmvc/pom.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 94a27941d..0a40f61f5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1 + 4.3.2-SNAPSHOT pom Spring Data REST diff --git a/spring-data-rest-core/pom.xml b/spring-data-rest-core/pom.xml index 389fda547..c38cb83e7 100644 --- a/spring-data-rest-core/pom.xml +++ b/spring-data-rest-core/pom.xml @@ -11,7 +11,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1 + 4.3.2-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-distribution/pom.xml b/spring-data-rest-distribution/pom.xml index 535a4f3b3..5655f4bb2 100644 --- a/spring-data-rest-distribution/pom.xml +++ b/spring-data-rest-distribution/pom.xml @@ -13,7 +13,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1 + 4.3.2-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml index 562116181..5ae7e644e 100644 --- a/spring-data-rest-hal-explorer/pom.xml +++ b/spring-data-rest-hal-explorer/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1 + 4.3.2-SNAPSHOT spring-data-rest-hal-explorer diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml index 059866a29..7f168dd54 100644 --- a/spring-data-rest-tests/pom.xml +++ b/spring-data-rest-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1 + 4.3.2-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml index 39d994982..c6b5d0ffe 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1 + 4.3.2-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-webmvc - 4.3.1 + 4.3.2-SNAPSHOT diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml index 4b0db02f6..67ceb60eb 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1 + 4.3.2-SNAPSHOT ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.1 + 4.3.2-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml index e5c002a81..4fec82fb3 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1 + 4.3.2-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.1 + 4.3.2-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml index 3f950726a..9342e092c 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1 + 4.3.2-SNAPSHOT ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.1 + 4.3.2-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml index 8c64a5429..20e483d18 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml @@ -4,7 +4,7 @@ org.springframework.data spring-data-rest-tests - 4.3.1 + 4.3.2-SNAPSHOT Spring Data REST Tests - Shop spring-data-rest-tests-shop diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml index 2c2e51b18..9609b1712 100644 --- a/spring-data-rest-webmvc/pom.xml +++ b/spring-data-rest-webmvc/pom.xml @@ -12,7 +12,7 @@ org.springframework.data spring-data-rest-parent - 4.3.1 + 4.3.2-SNAPSHOT ../pom.xml From d2c96cf92ae38d4e7dee64d9b3f3d4cc62e3cb8d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jun 2024 10:47:59 +0200 Subject: [PATCH 06/80] After release cleanups. See #2386 --- pom.xml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 0a40f61f5..861ce23a3 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.data.build spring-data-parent - 3.3.1 + 3.3.2-SNAPSHOT @@ -28,10 +28,10 @@ multi spring-data-rest - 3.3.1 - 3.3.1 - 4.3.1 - 3.3.1 + 3.3.2-SNAPSHOT + 3.3.2-SNAPSHOT + 4.3.2-SNAPSHOT + 3.3.2-SNAPSHOT 6.5.0.CR1 @@ -136,8 +136,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From fbc171444d2ec4d7893fe2a94d3904128301e51d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 20 Jun 2024 14:28:01 +0200 Subject: [PATCH 07/80] Switch to Broadcom docker proxy. Closes #2392 --- Jenkinsfile | 76 +++++++++++++++++++++++------------------- ci/pipeline.properties | 7 ++-- 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f940de73..bc7bb8e06 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,17 +38,19 @@ pipeline { } steps { script { - docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) { - sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log' - sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &' - sh 'sleep 10' - sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"' - sh 'sleep 15' - 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 test -Dsort -U -B -Pit' + docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { + docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) { + sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log' + sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &' + sh 'sleep 10' + sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"' + sh 'sleep 15' + 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 test -Dsort -U -B -Pit' + } } } } @@ -75,17 +77,19 @@ pipeline { } steps { script { - docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) { - sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log' - sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &' - sh 'sleep 10' - sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"' - sh 'sleep 15' - 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 test -Dsort -U -B -Pit' + docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { + docker.image("springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) { + sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log' + sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &' + sh 'sleep 10' + sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"' + sh 'sleep 15' + 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 test -Dsort -U -B -Pit' + } } } } @@ -114,19 +118,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-rest " + - "-Dartifactory.build-number=spring-data-rest-${BRANCH_NAME}-build-${BUILD_NUMBER} " + - "-Dmaven.test.skip=true clean deploy -U -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 -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-rest " + + "-Dartifactory.build-number=spring-data-rest-${BRANCH_NAME}-build-${BUILD_NUMBER} " + + "-Dmaven.test.skip=true clean deploy -U -B" + } } } } diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 60057f265..824563a21 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 @@ -14,6 +14,7 @@ docker.mongodb.7.0.version=7.0.2 # Supported versions of Redis docker.redis.6.version=6.2.13 +docker.redis.7.version=7.2.4 # Supported versions of Cassandra docker.cassandra.3.version=3.11.16 @@ -25,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 2a07647f588048852079f36b0ca438df2f5ead7e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 20 Jun 2024 14:28:14 +0200 Subject: [PATCH 08/80] Remove Slack notification. See #2392 --- Jenkinsfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bc7bb8e06..365574917 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -142,10 +142,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 6e0ebf953cf2675feb2ec09e225767c7e5ee16c1 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 19:09:01 +0200 Subject: [PATCH 09/80] Prepare 4.3.2 (2024.0.2). See #2391 --- pom.xml | 26 +++++++------------------- src/main/resources/notice.txt | 3 ++- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 861ce23a3..2cb88bf39 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.data.build spring-data-parent - 3.3.2-SNAPSHOT + 3.3.2 @@ -28,10 +28,10 @@ multi spring-data-rest - 3.3.2-SNAPSHOT - 3.3.2-SNAPSHOT - 4.3.2-SNAPSHOT - 3.3.2-SNAPSHOT + 3.3.2 + 3.3.2 + 4.3.2 + 3.3.2 6.5.0.CR1 @@ -136,20 +136,8 @@ - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - + + diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt index d8e76ad37..4053dcf17 100644 --- a/src/main/resources/notice.txt +++ b/src/main/resources/notice.txt @@ -1,4 +1,4 @@ -Spring Data REST 4.3.1 (2024.0.1) +Spring Data REST 4.3.2 (2024.0.2) Copyright (c) 2012-2019 Pivotal Software, Inc. This product is licensed to you under the Apache License, Version 2.0 @@ -55,5 +55,6 @@ subcomponent's license, as noted in the license.txt file. + From 05c0d2ae13db0dd695de81837c93786ccb250150 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 19:09:19 +0200 Subject: [PATCH 10/80] Release version 4.3.2 (2024.0.2). See #2391 --- pom.xml | 2 +- spring-data-rest-core/pom.xml | 2 +- spring-data-rest-distribution/pom.xml | 2 +- spring-data-rest-hal-explorer/pom.xml | 2 +- spring-data-rest-tests/pom.xml | 2 +- spring-data-rest-tests/spring-data-rest-tests-core/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml | 4 ++-- .../spring-data-rest-tests-security/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml | 2 +- spring-data-rest-webmvc/pom.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 2cb88bf39..50201ab74 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2-SNAPSHOT + 4.3.2 pom Spring Data REST diff --git a/spring-data-rest-core/pom.xml b/spring-data-rest-core/pom.xml index c38cb83e7..712ff946d 100644 --- a/spring-data-rest-core/pom.xml +++ b/spring-data-rest-core/pom.xml @@ -11,7 +11,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2-SNAPSHOT + 4.3.2 ../pom.xml diff --git a/spring-data-rest-distribution/pom.xml b/spring-data-rest-distribution/pom.xml index 5655f4bb2..b49a5a188 100644 --- a/spring-data-rest-distribution/pom.xml +++ b/spring-data-rest-distribution/pom.xml @@ -13,7 +13,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2-SNAPSHOT + 4.3.2 ../pom.xml diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml index 5ae7e644e..1f88001c9 100644 --- a/spring-data-rest-hal-explorer/pom.xml +++ b/spring-data-rest-hal-explorer/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2-SNAPSHOT + 4.3.2 spring-data-rest-hal-explorer diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml index 7f168dd54..2b6b21c70 100644 --- a/spring-data-rest-tests/pom.xml +++ b/spring-data-rest-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2-SNAPSHOT + 4.3.2 ../pom.xml diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml index c6b5d0ffe..5e52de08e 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2-SNAPSHOT + 4.3.2 ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-webmvc - 4.3.2-SNAPSHOT + 4.3.2 diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml index 67ceb60eb..b777b59c3 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2-SNAPSHOT + 4.3.2 ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.2-SNAPSHOT + 4.3.2 test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml index 4fec82fb3..864ac5887 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2-SNAPSHOT + 4.3.2 ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.2-SNAPSHOT + 4.3.2 test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml index 9342e092c..7c2e537f1 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2-SNAPSHOT + 4.3.2 ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.2-SNAPSHOT + 4.3.2 test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml index 20e483d18..0d78904d7 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml @@ -4,7 +4,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2-SNAPSHOT + 4.3.2 Spring Data REST Tests - Shop spring-data-rest-tests-shop diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml index 9609b1712..29a43e32c 100644 --- a/spring-data-rest-webmvc/pom.xml +++ b/spring-data-rest-webmvc/pom.xml @@ -12,7 +12,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2-SNAPSHOT + 4.3.2 ../pom.xml From bfdc4952f1149df5a36ff7bfa8640ae35b57cae4 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 19:12:14 +0200 Subject: [PATCH 11/80] Prepare next development iteration. See #2391 --- pom.xml | 2 +- spring-data-rest-core/pom.xml | 2 +- spring-data-rest-distribution/pom.xml | 2 +- spring-data-rest-hal-explorer/pom.xml | 2 +- spring-data-rest-tests/pom.xml | 2 +- spring-data-rest-tests/spring-data-rest-tests-core/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml | 4 ++-- .../spring-data-rest-tests-security/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml | 2 +- spring-data-rest-webmvc/pom.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 50201ab74..e50ace5cf 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2 + 4.3.3-SNAPSHOT pom Spring Data REST diff --git a/spring-data-rest-core/pom.xml b/spring-data-rest-core/pom.xml index 712ff946d..1fbc104b7 100644 --- a/spring-data-rest-core/pom.xml +++ b/spring-data-rest-core/pom.xml @@ -11,7 +11,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2 + 4.3.3-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-distribution/pom.xml b/spring-data-rest-distribution/pom.xml index b49a5a188..6d080bc85 100644 --- a/spring-data-rest-distribution/pom.xml +++ b/spring-data-rest-distribution/pom.xml @@ -13,7 +13,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2 + 4.3.3-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml index 1f88001c9..9f1391c2a 100644 --- a/spring-data-rest-hal-explorer/pom.xml +++ b/spring-data-rest-hal-explorer/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2 + 4.3.3-SNAPSHOT spring-data-rest-hal-explorer diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml index 2b6b21c70..d125b78f9 100644 --- a/spring-data-rest-tests/pom.xml +++ b/spring-data-rest-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2 + 4.3.3-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml index 5e52de08e..256b0503c 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2 + 4.3.3-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-webmvc - 4.3.2 + 4.3.3-SNAPSHOT diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml index b777b59c3..89aebc9a8 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2 + 4.3.3-SNAPSHOT ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.2 + 4.3.3-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml index 864ac5887..5ae7ee876 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2 + 4.3.3-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.2 + 4.3.3-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml index 7c2e537f1..c7c09e617 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2 + 4.3.3-SNAPSHOT ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.3.2 + 4.3.3-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml index 0d78904d7..d359aac09 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml @@ -4,7 +4,7 @@ org.springframework.data spring-data-rest-tests - 4.3.2 + 4.3.3-SNAPSHOT Spring Data REST Tests - Shop spring-data-rest-tests-shop diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml index 29a43e32c..4b98d1f13 100644 --- a/spring-data-rest-webmvc/pom.xml +++ b/spring-data-rest-webmvc/pom.xml @@ -12,7 +12,7 @@ org.springframework.data spring-data-rest-parent - 4.3.2 + 4.3.3-SNAPSHOT ../pom.xml From 956dedbbea02a727bd20f8f744a7ea4468632fd1 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 12 Jul 2024 19:12:15 +0200 Subject: [PATCH 12/80] After release cleanups. See #2391 --- pom.xml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index e50ace5cf..95beea0dc 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.data.build spring-data-parent - 3.3.2 + 3.3.3-SNAPSHOT @@ -28,10 +28,10 @@ multi spring-data-rest - 3.3.2 - 3.3.2 - 4.3.2 - 3.3.2 + 3.3.3-SNAPSHOT + 3.3.3-SNAPSHOT + 4.3.3-SNAPSHOT + 3.3.3-SNAPSHOT 6.5.0.CR1 @@ -136,8 +136,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From 267575b383b825bf9c3aef46ed02851727a452cb Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 31 Jul 2024 11:17:37 +0200 Subject: [PATCH 13/80] Bundle Javadoc with Antora documentation site. Closes #2400 --- .gitignore | 1 - spring-data-rest-distribution/package.json | 10 ++++++++++ spring-data-rest-distribution/pom.xml | 2 +- src/main/antora/antora-playbook.yml | 8 +++----- src/main/antora/antora.yml | 5 +++++ src/main/antora/modules/ROOT/nav.adoc | 3 ++- src/main/antora/modules/ROOT/pages/events.adoc | 16 ++++++++-------- .../antora/modules/ROOT/pages/integration.adoc | 4 ++-- src/main/antora/modules/ROOT/pages/intro.adoc | 2 +- 9 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 spring-data-rest-distribution/package.json diff --git a/.gitignore b/.gitignore index ef40aef30..3796d5264 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,5 @@ out/ _site node_modules package-lock.json -package.json node .mvn/.gradle-enterprise diff --git a/spring-data-rest-distribution/package.json b/spring-data-rest-distribution/package.json new file mode 100644 index 000000000..4689506b3 --- /dev/null +++ b/spring-data-rest-distribution/package.json @@ -0,0 +1,10 @@ +{ + "dependencies": { + "antora": "3.2.0-alpha.6", + "@antora/atlas-extension": "1.0.0-alpha.2", + "@antora/collector-extension": "1.0.0-alpha.7", + "@asciidoctor/tabs": "1.0.0-beta.6", + "@springio/antora-extensions": "1.13.0", + "@springio/asciidoctor-extensions": "1.0.0-alpha.11" + } +} diff --git a/spring-data-rest-distribution/pom.xml b/spring-data-rest-distribution/pom.xml index 6d080bc85..8e38507b8 100644 --- a/spring-data-rest-distribution/pom.xml +++ b/spring-data-rest-distribution/pom.xml @@ -49,7 +49,7 @@ - io.spring.maven.antora + org.antora antora-maven-plugin diff --git a/src/main/antora/antora-playbook.yml b/src/main/antora/antora-playbook.yml index 4fa8c6053..73a57d304 100644 --- a/src/main/antora/antora-playbook.yml +++ b/src/main/antora/antora-playbook.yml @@ -3,8 +3,7 @@ # The purpose of this Antora playbook is to build the docs in the current branch. antora: extensions: - - '@antora/collector-extension' - - require: '@springio/antora-extensions/root-component-extension' + - require: '@springio/antora-extensions' root_component_name: 'data-rest' site: title: Spring Data REST @@ -17,13 +16,12 @@ content: worktrees: true asciidoc: attributes: - page-pagination: '' hide-uri-scheme: '@' tabs-sync-option: '@' - chomp: 'all' extensions: - '@asciidoctor/tabs' - '@springio/asciidoctor-extensions' + - '@springio/asciidoctor-extensions/javadoc-extension' sourcemap: true urls: latest_version_segment: '' @@ -33,5 +31,5 @@ runtime: format: pretty ui: bundle: - url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.5/ui-bundle.zip + url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip snapshot: true diff --git a/src/main/antora/antora.yml b/src/main/antora/antora.yml index c7f815e22..f8fb61f77 100644 --- a/src/main/antora/antora.yml +++ b/src/main/antora/antora.yml @@ -10,3 +10,8 @@ ext: local: true scan: dir: spring-data-rest-distribution/target/classes/ + - run: + command: ./mvnw package -Pdistribute + local: true + scan: + dir: target/antora diff --git a/src/main/antora/modules/ROOT/nav.adoc b/src/main/antora/modules/ROOT/nav.adoc index 8d89de62c..366c6aab9 100644 --- a/src/main/antora/modules/ROOT/nav.adoc +++ b/src/main/antora/modules/ROOT/nav.adoc @@ -27,4 +27,5 @@ ** xref:customizing/custom-jackson-deserialization.adoc[] ** xref:customizing/configuring-cors.adoc[] -* https://github.com/spring-projects/spring-data-commons/wiki[Wiki] +* xref:attachment$api/java/index.html[Javadoc,role=link-external,window=_blank] +* https://github.com/spring-projects/spring-data-commons/wiki[Wiki,role=link-external,window=_blank] diff --git a/src/main/antora/modules/ROOT/pages/events.adoc b/src/main/antora/modules/ROOT/pages/events.adoc index 98b5a877a..b98753be1 100644 --- a/src/main/antora/modules/ROOT/pages/events.adoc +++ b/src/main/antora/modules/ROOT/pages/events.adoc @@ -3,14 +3,14 @@ The REST exporter emits eight different events throughout the process of working with an entity: -* `BeforeCreateEvent` -* `AfterCreateEvent` -* `BeforeSaveEvent` -* `AfterSaveEvent` -* `BeforeLinkSaveEvent` -* `AfterLinkSaveEvent` -* `BeforeDeleteEvent` -* `AfterDeleteEvent` +* javadoc:org.springframework.data.rest.core.event.BeforeCreateEvent[] +* javadoc:org.springframework.data.rest.core.event.AfterCreateEvent[] +* javadoc:org.springframework.data.rest.core.event.BeforeSaveEvent[] +* javadoc:org.springframework.data.rest.core.event.AfterSaveEvent[] +* javadoc:org.springframework.data.rest.core.event.BeforeLinkSaveEvent[] +* javadoc:org.springframework.data.rest.core.event.AfterLinkSaveEvent[] +* javadoc:org.springframework.data.rest.core.event.BeforeDeleteEvent[] +* javadoc:org.springframework.data.rest.core.event.AfterDeleteEvent[] [[events.application-listener]] == Writing an `ApplicationListener` diff --git a/src/main/antora/modules/ROOT/pages/integration.adoc b/src/main/antora/modules/ROOT/pages/integration.adoc index ac04cb33c..accd11165 100644 --- a/src/main/antora/modules/ROOT/pages/integration.adoc +++ b/src/main/antora/modules/ROOT/pages/integration.adoc @@ -10,7 +10,7 @@ Sometimes you need to add links to exported resources in your own custom-built S * Manually assembling links. * Using Spring HATEOAS's https://docs.spring.io/spring-hateoas/docs/current/reference/html/#fundamentals.obtaining-links.builder[`LinkBuilder`] with `linkTo()`, `slash()`, and so on. -* Using Spring Data REST's implementation of https://docs.spring.io/spring-data/rest/docs/current/api/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.html[`RepositoryEntityLinks`]. +* Using Spring Data REST's implementation of javadoc:org.springframework.data.rest.webmvc.support.RepositoryEntityLinks[]. The first suggestion is terrible and should be avoided at all costs. It makes your code brittle and high-risk. The second is handy when creating links to other hand-written Spring MVC controllers. The last one, which we explore in the rest of this section, is good for looking up resource links that are exported by Spring Data REST. @@ -54,4 +54,4 @@ With the class in the preceding example, you can use the following operations: |=== -NOTE: All of the search-based links support extra parameters for paging and sorting. See https://docs.spring.io/spring-data/rest/docs/current/api/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.html[`RepositoryEntityLinks`] for the details. There is also `linkFor(Class type)`, but that returns a Spring HATEOAS `LinkBuilder`, which returns you to the lower level API. Try to use the other ones first. +NOTE: All of the search-based links support extra parameters for paging and sorting. See javadoc:org.springframework.data.rest.webmvc.support.RepositoryEntityLinks[] for the details. There is also `linkFor(Class type)`, but that returns a Spring HATEOAS `LinkBuilder`, which returns you to the lower level API. Try to use the other ones first. diff --git a/src/main/antora/modules/ROOT/pages/intro.adoc b/src/main/antora/modules/ROOT/pages/intro.adoc index 8e5c61f4f..d8a53d909 100644 --- a/src/main/antora/modules/ROOT/pages/intro.adoc +++ b/src/main/antora/modules/ROOT/pages/intro.adoc @@ -2,6 +2,6 @@ = Introduction :page-section-summary-toc: 1 -REST web services have become the number one means for application integration on the web. In its core, REST defines that a system that consists of resources with which clients interact. These resources are implemented in a hypermedia-driven way. link:{springDocsUrl}/web.html#spring-web[Spring MVC] and link:{springDocsUrl}/web-reactive.html#spring-webflux[Spring WebFlux] each offer a solid foundation to build theses kinds of services. However, implementing even the simplest tenet of REST web services for a multi-domain object system can be quite tedious and result in a lot of boilerplate code. +REST web services have become the number one means for application integration on the web. In its core, REST defines that a system that consists of resources with which clients interact. These resources are implemented in a hypermedia-driven way. link:{springDocsUrl}/web.html#spring-web[Spring MVC] and link:{springDocsUrl}/web-reactive.html#spring-webflux[Spring WebFlux] each offer a solid foundation to build these kinds of services. However, implementing even the simplest tenet of REST web services for a multi-domain object system can be quite tedious and result in a lot of boilerplate code. Spring Data REST builds on top of the Spring Data repositories and automatically exports those as REST resources. It leverages hypermedia to let clients automatically find functionality exposed by the repositories and integrate these resources into related hypermedia-based functionality. From 0b0d0527dc8e256f21506e7c4d68b57d282b086a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 10:19:19 +0200 Subject: [PATCH 14/80] Update CI properties. See #2397 --- ci/pipeline.properties | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 824563a21..40bb34919 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} @@ -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 d759a74fcfec396c6818e2cb97dd1e59990ca36f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 10:23:14 +0200 Subject: [PATCH 15/80] Upgrade to Maven Wrapper 3.9.8. See #2406 --- .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 e3d7d68a8..55669ede4 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -#Thu Dec 14 08:40:44 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:23:14 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 6e67d6811d7860e75aedce32ec82d4403b8989f2 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Thu, 8 Aug 2024 08:04:06 -0500 Subject: [PATCH 16/80] Migrate build to Spring Develocity Conventions extension. * Migrate build to Spring Develocity Conventions extension. * Adopt Develocity environment variables. Closes #2399 --- .gitignore | 2 +- .mvn/extensions.xml | 11 +++-------- .mvn/gradle-enterprise.xml | 31 ------------------------------- Jenkinsfile | 12 ------------ 4 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 .mvn/gradle-enterprise.xml diff --git a/.gitignore b/.gitignore index 3796d5264..3dac3f38d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ _site node_modules package-lock.json node -.mvn/.gradle-enterprise +.mvn/.develocity diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index ebd761025..1e3bb355f 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 f5ad51339..000000000 --- a/.mvn/gradle-enterprise.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - https://ge.spring.io - - - #{isFalse(env['CI'])} - 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 365574917..f836cad02 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,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 { @@ -46,9 +45,6 @@ pipeline { sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"' sh 'sleep 15' 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 test -Dsort -U -B -Pit' } } @@ -72,7 +68,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 { @@ -85,9 +80,6 @@ pipeline { sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"' sh 'sleep 15' 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 test -Dsort -U -B -Pit' } } @@ -112,7 +104,6 @@ pipeline { environment { ARTIFACTORY = credentials("${p['artifactory.credentials']}") - DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}") DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}") } @@ -121,9 +112,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 -Pci,artifactory " + "-Dartifactory.server=${p['artifactory.url']} " + "-Dartifactory.username=${ARTIFACTORY_USR} " + From 9e57be2c76c1cddd88372954dd5ff6e11372217a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Aug 2024 16:00:29 +0200 Subject: [PATCH 17/80] Switch to manual mocking instead of using Mockito annotation. Closes #2409 --- ...itoryPropertyReferenceControllerIntegrationTests.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceControllerIntegrationTests.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceControllerIntegrationTests.java index 1814fc9de..6114f8c91 100755 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceControllerIntegrationTests.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceControllerIntegrationTests.java @@ -16,13 +16,12 @@ package org.springframework.data.rest.webmvc; import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.rest.tests.AbstractControllerIntegrationTests; import org.springframework.data.rest.webmvc.jpa.Book; @@ -36,7 +35,6 @@ /** * @author Oliver Gierke */ -@ExtendWith(MockitoExtension.class) @ContextConfiguration(classes = JpaRepositoryConfig.class) @Transactional class RepositoryPropertyReferenceControllerIntegrationTests extends AbstractControllerIntegrationTests { @@ -45,7 +43,8 @@ class RepositoryPropertyReferenceControllerIntegrationTests extends AbstractCont @Autowired TestDataPopulator populator; @Autowired BookRepository books; - @Mock(answer = Answers.RETURNS_MOCKS) RepresentationModelAssemblers assembler; + RepresentationModelAssemblers assembler = mock(RepresentationModelAssemblers.class, + withSettings().defaultAnswer(Answers.RETURNS_MOCKS)); RootResourceInformation information; @BeforeEach From aa28a3157d99f362601102228a6cb21ef8e4d387 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 15 Aug 2024 14:42:31 +0200 Subject: [PATCH 18/80] Upgrade to HAL Explorer 1.2.2. Fixes #2411. --- spring-data-rest-hal-explorer/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml index 9f1391c2a..5ed553f92 100644 --- a/spring-data-rest-hal-explorer/pom.xml +++ b/spring-data-rest-hal-explorer/pom.xml @@ -13,7 +13,7 @@ Spring Data REST - HAL Explorer - 1.2.1 + 1.2.2 spring.data.rest.hal.explorer