From 65aa7bcaebb6ac806ab04a6ab71c0877c75a7710 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:31:49 -0800 Subject: [PATCH 01/18] Set version to 0.0.14-MOORE-SNAPSHOT. --- gradle.properties | 2 +- pom.xml | 2 +- spring-data-gemfire-test/pom.xml | 2 +- spring-data-geode-test/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9cdc021b..8642dd17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,4 +13,4 @@ springDataGeodeVersion=2.2.6.RELEASE springDataReleaseTrainVersion=Moore-SR6 #springDataReleaseTrainVersion=Neumann-BUILD-SNAPSHOT springShellVersion=1.2.0.RELEASE -version=0.0.14.RELEASE +version=0.0.14-MOORE-SNAPSHOT diff --git a/pom.xml b/pom.xml index df6e16dd..18e352e3 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.data spring-test-data-geode-build - 0.0.14.RELEASE + 0.0.14-MOORE-SNAPSHOT pom diff --git a/spring-data-gemfire-test/pom.xml b/spring-data-gemfire-test/pom.xml index ed958f18..b6c2b773 100644 --- a/spring-data-gemfire-test/pom.xml +++ b/spring-data-gemfire-test/pom.xml @@ -8,7 +8,7 @@ org.springframework.data spring-test-data-geode-build - 0.0.14.RELEASE + 0.0.14-MOORE-SNAPSHOT spring-data-gemfire-test diff --git a/spring-data-geode-test/pom.xml b/spring-data-geode-test/pom.xml index 38ef4ae6..0785cbce 100644 --- a/spring-data-geode-test/pom.xml +++ b/spring-data-geode-test/pom.xml @@ -8,7 +8,7 @@ org.springframework.data spring-test-data-geode-build - 0.0.14.RELEASE + 0.0.14-MOORE-SNAPSHOT spring-data-geode-test From 0cc201a2b0e56a0a00adcd4a43acee401d153975 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:33:40 -0800 Subject: [PATCH 02/18] Upgrade to AssertJ 3.18.0. --- gradle.properties | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8642dd17..1decfde9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ antlrVersion=2.7.7 apacheGeodeVersion=1.9.2 -assertjVersion=3.15.0 +assertjVersion=3.18.0 junitVersion=4.13 lombokVersion=1.18.12 mockitoVersion=3.3.3 diff --git a/pom.xml b/pom.xml index 18e352e3..63259058 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 2.19.1 UTF-8 - 3.15.0 + 3.18.0 4.13 2.12.1 1.2.3 From 600f7bfc87419524286b578790291b8b548a0b1b Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:34:09 -0800 Subject: [PATCH 03/18] Upgrade to JUnit 4.13.1. --- gradle.properties | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1decfde9..2fd69552 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ antlrVersion=2.7.7 apacheGeodeVersion=1.9.2 assertjVersion=3.18.0 -junitVersion=4.13 +junitVersion=4.13.1 lombokVersion=1.18.12 mockitoVersion=3.3.3 multithreadedtcVersion=1.01 diff --git a/pom.xml b/pom.xml index 63259058..201c6df4 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ UTF-8 3.18.0 - 4.13 + 4.13.1 2.12.1 1.2.3 1.18.12 From 4a283d30f57e0a15c7ec534acb2a0831ef8fe9a7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:34:54 -0800 Subject: [PATCH 04/18] Upgrade to Lombok 1.18.16. --- gradle.properties | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2fd69552..6bc9accf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ antlrVersion=2.7.7 apacheGeodeVersion=1.9.2 assertjVersion=3.18.0 junitVersion=4.13.1 -lombokVersion=1.18.12 +lombokVersion=1.18.16 mockitoVersion=3.3.3 multithreadedtcVersion=1.01 pivotalGemFireVersion=9.8.7 diff --git a/pom.xml b/pom.xml index 201c6df4..c91b7db0 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 4.13.1 2.12.1 1.2.3 - 1.18.12 + 1.18.16 3.3.3 1.01 From 7578d3a2c56f96e9337b6ceb09aa175a98468359 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:35:42 -0800 Subject: [PATCH 05/18] Upgrade to Mockito 3.6.0. --- gradle.properties | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6bc9accf..97f989e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ apacheGeodeVersion=1.9.2 assertjVersion=3.18.0 junitVersion=4.13.1 lombokVersion=1.18.16 -mockitoVersion=3.3.3 +mockitoVersion=3.6.0 multithreadedtcVersion=1.01 pivotalGemFireVersion=9.8.7 springVersion=5.2.5.RELEASE diff --git a/pom.xml b/pom.xml index c91b7db0..606c9ac1 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ 2.12.1 1.2.3 1.18.16 - 3.3.3 + 3.6.0 1.01 5.2.5.RELEASE From e8461c0452c9e169ff543ae3b66941bb35573c6e Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:36:59 -0800 Subject: [PATCH 06/18] Upgrade to VMware Tanzu (Pivotal) GemFire 9.8.10. --- gradle.properties | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 97f989e4..8b917f95 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ junitVersion=4.13.1 lombokVersion=1.18.16 mockitoVersion=3.6.0 multithreadedtcVersion=1.01 -pivotalGemFireVersion=9.8.7 +pivotalGemFireVersion=9.8.10 springVersion=5.2.5.RELEASE springBootVersion=2.2.6.RELEASE springDataGemFireVersion=2.2.6.RELEASE diff --git a/pom.xml b/pom.xml index 606c9ac1..e9670c6e 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 3.3

2.19.1

UTF-8 - + 1.9.2 3.18.0 4.13.1 2.12.1 @@ -91,7 +91,7 @@ 1.18.16 3.6.0 1.01 - + 9.8.10 5.2.5.RELEASE

2.2.6.RELEASE

Moore-BUILD-SNAPSHOT From 6bfaf6bf7a9095add787a9b82c1ec2aacde811a9 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:38:23 -0800 Subject: [PATCH 07/18] Upgrade to Spring Framework 5.2.10.RELEASE. --- gradle.properties | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8b917f95..eaa2809e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ lombokVersion=1.18.16 mockitoVersion=3.6.0 multithreadedtcVersion=1.01 pivotalGemFireVersion=9.8.10 -springVersion=5.2.5.RELEASE +springVersion=5.2.10.RELEASE springBootVersion=2.2.6.RELEASE springDataGemFireVersion=2.2.6.RELEASE springDataGeodeVersion=2.2.6.RELEASE diff --git a/pom.xml b/pom.xml index e9670c6e..3ace1fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 3.6.0 1.01 9.8.10 - 5.2.5.RELEASE + 5.2.10.RELEASE

2.2.6.RELEASE

Moore-BUILD-SNAPSHOT

1.2.0.RELEASE From 5e46ae5f9f24e391a780b62aa314b7239ecb25f7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:38:56 -0800 Subject: [PATCH 08/18] Upgrade to Spring Boot 2.2.11.RELEASE. --- gradle.properties | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index eaa2809e..fb2dfe0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ mockitoVersion=3.6.0 multithreadedtcVersion=1.01 pivotalGemFireVersion=9.8.10 springVersion=5.2.10.RELEASE -springBootVersion=2.2.6.RELEASE +springBootVersion=2.2.11.RELEASE springDataGemFireVersion=2.2.6.RELEASE springDataGeodeVersion=2.2.6.RELEASE springDataReleaseTrainVersion=Moore-SR6 diff --git a/pom.xml b/pom.xml index 3ace1fbe..f5f69f90 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ 1.01

9.8.10

5.2.10.RELEASE - 2.2.6.RELEASE + 2.2.11.RELEASE

Moore-BUILD-SNAPSHOT

1.2.0.RELEASE From cbcd07220b8a73de3094899396596e094ccb82c8 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:41:06 -0800 Subject: [PATCH 09/18] Upgrade to Spring Data Moore-SR11. Upgrade to Spring Data for Apache Geode & VMware Tanzu (Pivotal) GemFire 2.2.11.RELEASE. Upgrade to Spring Data Build 2.2.11.RELEASE. Upgrade to Spring Data Release Train (BOM) Moore-SR11. --- gradle.properties | 7 +++---- pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index fb2dfe0f..0671083a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,9 +8,8 @@ multithreadedtcVersion=1.01 pivotalGemFireVersion=9.8.10 springVersion=5.2.10.RELEASE springBootVersion=2.2.11.RELEASE -springDataGemFireVersion=2.2.6.RELEASE -springDataGeodeVersion=2.2.6.RELEASE -springDataReleaseTrainVersion=Moore-SR6 -#springDataReleaseTrainVersion=Neumann-BUILD-SNAPSHOT +springDataGemFireVersion=2.2.11.RELEASE +springDataGeodeVersion=2.2.11.RELEASE +springDataReleaseTrainVersion=Moore-SR11 springShellVersion=1.2.0.RELEASE version=0.0.14-MOORE-SNAPSHOT diff --git a/pom.xml b/pom.xml index f5f69f90..8ad46055 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-parent - 2.2.6.RELEASE + 2.2.11.RELEASE org.springframework.data @@ -94,7 +94,7 @@ 9.8.10 5.2.10.RELEASE 2.2.11.RELEASE - Moore-BUILD-SNAPSHOT + Moore-SR11 1.2.0.RELEASE From 7151aadce3d8daa5876bd6686c2e228ff627afc0 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 Nov 2020 14:43:09 -0800 Subject: [PATCH 10/18] Add dependency management for VMware Tanzu (Pivotal) GemFire. --- gradle/dependency-management.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index f10a1407..2602dda9 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -14,5 +14,9 @@ dependencyManagement { dependency "org.apache.geode:geode-cq:$apacheGeodeVersion" dependency "org.apache.geode:geode-lucene:$apacheGeodeVersion" dependency "org.apache.geode:geode-wan:$apacheGeodeVersion" + dependency "io.pivotal.gemfire:geode-core:$pivotalGemFireVersion" + dependency "io.pivotal.gemfire:geode-cq:$pivotalGemFireVersion" + dependency "io.pivotal.gemfire:geode-lucene:$pivotalGemFireVersion" + dependency "io.pivotal.gemfire:geode-wan:$pivotalGemFireVersion" } } From 13a441dbc5379bbad9b2130c30e03ae52a6fdf54 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 17 Nov 2020 12:45:23 -0800 Subject: [PATCH 11/18] Declare and configure repositories for all projects. --- build.gradle | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0e0df917..37381da7 100644 --- a/build.gradle +++ b/build.gradle @@ -11,8 +11,28 @@ buildscript { apply plugin: 'io.spring.convention.root' -group = 'org.springframework.data' -description = 'Spring Test Framework for Apache Geode and Pivotal GemFire using Spring Data.' +allprojects { + + group = 'org.springframework.data' + + repositories { + + mavenCentral() + + if (version.contains('-')) { + maven { url "https://repo.spring.io/milestone" } + } + if (version.endsWith('-SNAPSHOT')) { + maven { url "https://repo.spring.io/snapshot" } + } + } + + configurations.all { + resolutionStrategy.cacheChangingModulesFor 0, "minutes" + } +} + +description = 'Spring Test Framework for Apache Geode and VMware Tanzu GemFire using Spring Data.' ext['spring.version'] = "$springVersion" ext['spring-framework.version'] = "$springVersion" From ff5fdd170e5676c8bad9f0c2148650bd1554ba8b Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 17 Nov 2020 20:28:04 -0800 Subject: [PATCH 12/18] Upgrade to Spring Build Conventions Gradle Plugin 0.0.35.RELEASE. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 37381da7..1985544f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath 'io.spring.gradle:spring-build-conventions:0.0.31.RELEASE' + classpath 'io.spring.gradle:spring-build-conventions:0.0.35.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } repositories { From 07a92a33ec82a147062b6932882299f304bf2e5f Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 Nov 2020 10:01:41 -0800 Subject: [PATCH 13/18] Upgrade to AssertJ 3.18.1. --- gradle.properties | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0671083a..accdf782 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ antlrVersion=2.7.7 apacheGeodeVersion=1.9.2 -assertjVersion=3.18.0 +assertjVersion=3.18.1 junitVersion=4.13.1 lombokVersion=1.18.16 mockitoVersion=3.6.0 diff --git a/pom.xml b/pom.xml index 8ad46055..88630389 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 2.19.1 UTF-8 1.9.2 - 3.18.0 + 3.18.1 4.13.1 2.12.1 1.2.3 From fbaed7056348aadc8db45ff8039b50925615877b Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 Nov 2020 10:03:03 -0800 Subject: [PATCH 14/18] Upgrade to Spring Framework 5.2.11.RELEASE. --- gradle.properties | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index accdf782..65712d5c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ lombokVersion=1.18.16 mockitoVersion=3.6.0 multithreadedtcVersion=1.01 pivotalGemFireVersion=9.8.10 -springVersion=5.2.10.RELEASE +springVersion=5.2.11.RELEASE springBootVersion=2.2.11.RELEASE springDataGemFireVersion=2.2.11.RELEASE springDataGeodeVersion=2.2.11.RELEASE diff --git a/pom.xml b/pom.xml index 88630389..6817bb17 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 3.6.0 1.01 9.8.10 - 5.2.10.RELEASE + 5.2.11.RELEASE

2.2.11.RELEASE

Moore-SR11

1.2.0.RELEASE From cc35bd4fc83980cba632557cb464f5468ad5c2f2 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 Nov 2020 10:04:41 -0800 Subject: [PATCH 15/18] Upgrade to Gradle 6.7.1. --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b44297..4d9ca164 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From cdac54d624b1611fae461c509921e8dd04d0c8b0 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 22 Jan 2021 12:18:42 -0800 Subject: [PATCH 16/18] Upgrade to Spring Build Conventions Gradle Plugin 0.0.36. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1985544f..de54b0e9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath 'io.spring.gradle:spring-build-conventions:0.0.35.RELEASE' + classpath 'io.spring.gradle:spring-build-conventions:0.0.36' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } repositories { From 4e66588583677629b60e4e164a365dad086e086f Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 22 Jan 2021 12:21:42 -0800 Subject: [PATCH 17/18] Add Maven Central Repository to buildscript to resolve build dependencies. --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index de54b0e9..97a71771 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } repositories { + mavenCentral() gradlePluginPortal() maven { url 'https://repo.spring.io/plugins-release' } } From 1a65d3d9ca8d3510cfbfd5df1367fdce8cc87e19 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 22 Jan 2021 12:26:54 -0800 Subject: [PATCH 18/18] Set auth credentials when present to autheticate with Spring libs-snapshot Repository. --- build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.gradle b/build.gradle index 97a71771..f2024602 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,15 @@ buildscript { mavenCentral() gradlePluginPortal() maven { url 'https://repo.spring.io/plugins-release' } + maven { + url 'https://repo.spring.io/plugins-snapshot' + if (project.hasProperty('artifactoryUsername')) { + credentials { + username "$artifactoryUsername" + password "$artifactoryPassword" + } + } + } } }