From a2424b7fd32968786a43cba453bb510f7af0d260 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Feb 2022 18:57:47 -0800 Subject: [PATCH 001/201] Remove YAML configuration file for Travis CI. SBDG is no longer built with the public Travis CI build infrastructure. --- .travis.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4816c6ca1..000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: java - -os: - - linux - -sudo: required - -services: - - docker - -jdk: - - openjdk8 - -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ - -install: true - -script: ./gradlew --info --refresh-dependencies clean build From c5edb5f4b54cbfe9192d4864dec6537f883d5148 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Feb 2022 18:06:07 -0800 Subject: [PATCH 002/201] Fix grammatical errors in README. --- README.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 30c0f89db..9fcb70cdc 100644 --- a/README.adoc +++ b/README.adoc @@ -218,7 +218,7 @@ stored in {geode-name}. This is not unlike JPA's `@javax.persistence.Table` and annotations. NOTE: An {geode-name} `Region` is equivalent to a database table and the cache is equivalent to a database schema. -A database schema is a namespace for a collection of tables whereas an {geode-name} cache is a namespace or group of +A database schema is a namespace for a collection of tables whereas an {geode-name} cache is a namespace for a group of `Regions` that hold the data. Each data store has its own data structure to organize and manage data. An RDBMS uses a tabular data structure. Graph databases use a graph. Well, {geode-name} uses a `Region`, which is simply a key/value data structure, or a map. In fact, an {geode-name} `Region` implements `java.util.Map` (indirectly) and is essentially @@ -304,9 +304,9 @@ _auto-configure_ an {geode-name} `ClientCache` instance by default when SBDG is With the SDG `@Region` mapping annotation, we declared that instances of `User` will be stored in the "`Users`" `Region`. However, we have not yet created a "`Users`" `Region`. This is where the `@EnableEntityDefinedRegions` annotation comes in handy. Like JPA/Hibernate's ability to create database tables from our `@Entity` declared classes, SDG's -`@EnableEntityDefineRegions` annotation scans the classpath for application entity classes (e.g. `User`) +`@EnableEntityDefinedRegions` annotation scans the classpath for application entity classes (e.g. `User`) and detects any classes annotated with `@Region` in order to create the named `Region` required by the application -to persist data. The `basePackageClasses` attribute is a type-safe way to pinpoint the scan. +to persist data. The `basePackageClasses` attribute is a type-safe way to limit the scope of the scan. While useful and convenient during development, `@EnableEntityDefinedRegions` was not made into an _auto-configuration_ feature by default since there are many ways to define and configure a `Region`, which varies from data type to data From 0571e780737cc32381c60e5ed4037051d6faaa49 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Feb 2022 18:58:23 -0800 Subject: [PATCH 003/201] Edit README and set build status to refer to the Jenkins CI build environment. --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 9fcb70cdc..c7fda7822 100644 --- a/README.adoc +++ b/README.adoc @@ -7,7 +7,7 @@ :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire -image:https://api.travis-ci.org/spring-projects/spring-boot-data-geode.svg?branch=master["Build Status", link="https://travis-ci.org/spring-projects/spring-boot-data-geode"] +image:https://jenkins.spring.io/buildStatus/icon?job=spring-boot-data-geode%2F1.7.x&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-boot-data-geode/] [[about]] == Spring Boot for {geode-name} From 8c5ce38a80bb3cb37ce09abd07c2b29cfe65a4c7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Feb 2022 19:27:28 -0800 Subject: [PATCH 004/201] Exclude build/ and target/ (output) directories from NoHTTP check. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 43ef90b97..fecd12d3b 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ allprojects { } nohttp { - source.excludes = [ "**/.gradle/**", "**/.m2/**" ] + source.excludes = [ "**/.gradle/**", "**/.m2/**", "**/build/**", "**/target/**" ] } description = 'Spring Boot for Apache Geode' From 5361c6d7490f420f2ba879dbaf5d5b7042084d62 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:38:07 -0800 Subject: [PATCH 005/201] Edit changelog and include 1.5.10 release notes. --- spring-geode/src/main/resources/changelog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index bb71cee88..14ab8affb 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,18 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.5.10 (2022-02-28) +-------------------------------------- +Aligns SBDG with Spring Boot 2.5.10. + +* Upgrades to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.13.6. +* Upgrades to Spring Framework 5.3.16. +* Upgrades to Spring Boot 2.5.10. +* Upgrades to Spring Data BOM 2021.0.9. +* Upgrades to Spring Data for Apache Geode 2.5.9. +* Upgrades to Spring Session BOM 2021.0.5. + + Changes in version 1.7.0-M1 (2022-01-21) ---------------------------------------- Aligns SBDG with Spring Boot 2.7.0-M1. From 436cecb211426f6b136576b05df37c39c45e5de4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:38:40 -0800 Subject: [PATCH 006/201] Edit README to refer to 1.5.10 release and 1.5.11-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index c7fda7822..0b7b1f2c2 100644 --- a/README.adoc +++ b/README.adoc @@ -77,8 +77,8 @@ The following SBDG versions are currently maintained and developed. | `1.7.0-M1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.4-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.3`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] -| `1.5.10-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.5.9`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] +| `1.5.11-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.5.10`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] |=== From 3d95688780333de5d868f0dc2c7a79af3a7945cc Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:39:23 -0800 Subject: [PATCH 007/201] Edit changelog and include 1.6.4 release notes. --- spring-geode/src/main/resources/changelog.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 14ab8affb..e053182a0 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,19 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.4 (2022-02-28) +------------------------------------- +Aligns SBDG with Spring Boot 2.6.4. + +* Upgrades to Apache Geode 1.14.3. +* Upgrades to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.14.3. +* Upgrades to Spring Framework 5.3.16. +* Upgrades to Spring Boot 2.6.4. +* Upgrades to Spring Data BOM 2021.1.2. +* Upgrades to Spring Data for Apache Geode 2.6.2 +* Upgrades to Spring Session BOM 2021.1.2. + + Changes in version 1.5.10 (2022-02-28) -------------------------------------- Aligns SBDG with Spring Boot 2.5.10. From 311d32acb347c4aa3c032ebd23b90427c6131940 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:40:05 -0800 Subject: [PATCH 008/201] Edit README to refer to 1.6.4 release and 1.6.5-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 0b7b1f2c2..663a4855e 100644 --- a/README.adoc +++ b/README.adoc @@ -75,8 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.0-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.0-M1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.4-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.3`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] +| `1.6.5-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.4`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] | `1.5.11-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.5.10`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] From 4e8082b16d0372e3bba99636a7c880640ec46223 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:45:07 -0800 Subject: [PATCH 009/201] Upgrade to Apache Geode 1.14.3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 34479b7cb..54331a90d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 deployDocsHost=docs-ip.spring.io antlrVersion=2.7.7 -apacheGeodeVersion=1.14.2 +apacheGeodeVersion=1.14.3 awaitilityVersion=4.1.1 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 From 922b17f01b117e9f9b6e0c844e4cb239dae10270 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:46:00 -0800 Subject: [PATCH 010/201] Upgrade to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.14.3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 54331a90d..f6f80f355 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ apacheGeodeVersion=1.14.3 awaitilityVersion=4.1.1 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 -pivotalCloudCacheVersion=1.14.2 +pivotalCloudCacheVersion=1.14.3 pivotalGemFireVersion=9.10.14 springVersion=5.3.15 springBootVersion=2.7.0-SNAPSHOT From 92119506cef96bf74e9dfaa5d0ec4ee0575c2cd2 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:46:51 -0800 Subject: [PATCH 011/201] Upgrade to Spring Framework 5.3.16. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f6f80f355..af062eefe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.3 pivotalGemFireVersion=9.10.14 -springVersion=5.3.15 +springVersion=5.3.16 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M2 From 5e3fddd37d36577945ae68477e6f380495d9d074 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:47:13 -0800 Subject: [PATCH 012/201] Uprade to Spring Boot 2.7.0-M2. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index af062eefe..78b2ce7fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.3 pivotalGemFireVersion=9.10.14 springVersion=5.3.16 -springBootVersion=2.7.0-SNAPSHOT +springBootVersion=2.7.0-M2 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M2 springDataGeodeVersion=2.7.0-M2 From b7114dc1edbb0ae4072df1dab04a335eff020aef Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:47:50 -0800 Subject: [PATCH 013/201] Upgrade to Spring Data BOM 2021.2.0-M3 (Raj-M3). --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 78b2ce7fb..a68daa70a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.14 springVersion=5.3.16 springBootVersion=2.7.0-M2 springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.0-M2 +springDataBomVersion=2021.2.0-M3 springDataGeodeVersion=2.7.0-M2 springDataGeodeTestVersion=0.3.0-RAJ-M2 springSessionBomVersion=2021.2.0-M1 From 40a064e130f7d5af1ff8b04f8a166a05fca1d7db Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 14:48:39 -0800 Subject: [PATCH 014/201] Upgrade to Spring Data for Apache Geode 2.7.0-M3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a68daa70a..598225ed6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.16 springBootVersion=2.7.0-M2 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M3 -springDataGeodeVersion=2.7.0-M2 +springDataGeodeVersion=2.7.0-M3 springDataGeodeTestVersion=0.3.0-RAJ-M2 springSessionBomVersion=2021.2.0-M1 springSessionDataGeodeVersion=2.7.0-M1 From b15dfc8a57a817aa2d3d1da3d96e1dc3a6aafa62 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 12:11:26 -0800 Subject: [PATCH 015/201] Switch to Testcontainers BOM for Testcontainers dependency management. --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index f3249f0c2..19109ccdc 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,6 +1,7 @@ dependencyManagement { imports { mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion" + mavenBom "org.testcontainers:testcontainers-bom:$testcontainersVersion" } dependencies { dependency "antlr:antlr:$antlrVersion" @@ -17,6 +18,5 @@ dependencyManagement { dependency "org.springframework.data:spring-data-geode-test:$springDataGeodeTestVersion" dependency "org.springframework.session:spring-session-data-geode:$springSessionDataGeodeVersion" dependency "org.springframework.shell:spring-shell:$springShellVersion" - dependency "org.testcontainers:testcontainers:$testcontainersVersion" } } From 0f5115d8846675e0a8d274438e69937b884bf7cb Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 15:02:09 -0800 Subject: [PATCH 016/201] Upgrade Spring Geode Samples parent Maven POM to Spring Boot 2.7.0-M2. --- spring-geode-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index fc9b9d5a5..ea5380b91 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.0-M1 + 2.7.0-M2 From b9f3ebc0f2154dd437c2b9d50f0c40cb1e378d0e Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 15:16:44 -0800 Subject: [PATCH 017/201] Edit changelog and add 1.7.0-M2 release notes. --- spring-geode/src/main/resources/changelog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index e053182a0..1c8974579 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,18 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.7.0-M2 (2022-02-28) +---------------------------------------- +Aligns SBDG with Spring Boot 2.7.0-M2. + +* Upgrades to Apache Geode 1.14.3. +* Upgrades to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.14.3. +* Upgrades to Spring Framework 5.3.16. +* Upgrades to Spring Boot 2.7.0-M2. +* Upgrades to Spring Data BOM 2021.2.0-M3. +* Upgrades to Spring Data for Apache Geode 2.7.0-M3. + + Changes in version 1.6.4 (2022-02-28) ------------------------------------- Aligns SBDG with Spring Boot 2.6.4. From e557589b23fe0c5ac7a99dc6855a800d71e9e0f7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 15:18:20 -0800 Subject: [PATCH 018/201] Release 1.7.0-M2. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 598225ed6..dea494fa5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0-M1 springSessionDataGeodeVersion=2.7.0-M1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 -version=1.7.0-SNAPSHOT +version=1.7.0-M2 From c6d141db758816f4d75a60846d2b5c8bef72375b Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 15:28:27 -0800 Subject: [PATCH 019/201] Prepare next development iteration. Set Spring Boot version to 2.7.0-SNAPSHOT. Set version to 1.7.0-SNAPSHOT. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index dea494fa5..c837d5361 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.3 pivotalGemFireVersion=9.10.14 springVersion=5.3.16 -springBootVersion=2.7.0-M2 +springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M3 springDataGeodeVersion=2.7.0-M3 @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0-M1 springSessionDataGeodeVersion=2.7.0-M1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 -version=1.7.0-M2 +version=1.7.0-SNAPSHOT From 258412a31590080df8d5d3b7863b53486b63e63d Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 Feb 2022 15:42:41 -0800 Subject: [PATCH 020/201] Edit README to refer to 1.7.0-M2 release and 1.7.0-SNAPSHOT. Refer to Spring Boot 2.7.0-M2. --- README.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 663a4855e..9f867ca4a 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ :spring-docs: https://docs.spring.io/spring-framework/docs/current/reference/html/ :sbdg-docs: https://docs.spring.io/spring-boot-data-geode-build/current/reference/html5/ :sbdg-javadoc: https://docs.spring.io/spring-boot-data-geode-build/current/api/ -:sbdg-version: 1.7.0-M1 -:spring-boot-version: 2.7.0-M1 +:sbdg-version: 1.7.0-M2 +:spring-boot-version: 2.7.0-M2 :geode-javadoc: https://geode.apache.org/releases/latest/javadoc :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire @@ -74,7 +74,7 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.0-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.7.0-M1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] +| `1.7.0-M2`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.5-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.4`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] | `1.5.11-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] From b9cbffcaf65dce751a0b8b055d0429f5892ff2c0 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 2 Mar 2022 15:46:26 -0800 Subject: [PATCH 021/201] Update Copyright for 2022. --- .../geode/cache/AbstractCommonEventProcessingCacheListener.java | 2 +- .../org/springframework/geode/cache/SimpleCacheResolver.java | 2 +- .../geode/distributed/event/MembershipEvent.java | 2 +- .../geode/distributed/event/MembershipListenerAdapter.java | 2 +- .../geode/distributed/event/support/MemberDepartedEvent.java | 2 +- .../geode/distributed/event/support/MemberJoinedEvent.java | 2 +- .../geode/distributed/event/support/MemberSuspectEvent.java | 2 +- .../geode/distributed/event/support/QuorumLostEvent.java | 2 +- .../springframework/geode/pdx/PdxFieldNotWritableException.java | 2 +- .../java/org/springframework/geode/pdx/PdxInstanceBuilder.java | 2 +- .../java/org/springframework/geode/pdx/PdxInstanceWrapper.java | 2 +- .../org/springframework/geode/security/TestAuthInitialize.java | 2 +- .../org/springframework/geode/security/TestSecurityManager.java | 2 +- .../main/java/org/springframework/geode/util/CacheUtils.java | 2 +- .../java/org/springframework/geode/util/GeodeAssertions.java | 2 +- .../java/org/springframework/geode/util/GeodeConstants.java | 2 +- .../geode/util/function/InvocationArguments.java | 2 +- .../org/springframework/geode/util/function/TriConsumer.java | 2 +- .../org/springframework/geode/util/function/TupleConsumer.java | 2 +- .../springframework/geode/app/ApacheGeodeClientApplication.java | 2 +- .../AbstractCommonEventProcessingCacheListenerUnitTests.java | 2 +- .../geode/cache/SimpleCacheResolverUnitTests.java | 2 +- .../geode/cache/SimpleClientCacheResolverIntegrationTests.java | 2 +- .../geode/cache/SimplePeerCacheResolverIntegrationTests.java | 2 +- .../geode/distributed/event/MembershipEventUnitTests.java | 2 +- .../distributed/event/MembershipListenerAdapterUnitTests.java | 2 +- .../distributed/event/support/MemberDepartedEventUnitTests.java | 2 +- .../distributed/event/support/MemberJoinedEventUnitTests.java | 2 +- .../distributed/event/support/MemberSuspectEventUnitTests.java | 2 +- .../distributed/event/support/QuorumLostEventUnitTests.java | 2 +- .../springframework/geode/pdx/PdxInstanceBuilderUnitTests.java | 2 +- .../springframework/geode/pdx/PdxInstanceWrapperUnitTests.java | 2 +- .../geode/security/TestAuthInitializeUnitTests.java | 2 +- .../geode/security/TestSecurityManagerUnitTests.java | 2 +- .../org/springframework/geode/util/CacheUtilsUnitTests.java | 2 +- .../geode/util/function/InvocationArgumentsUnitTests.java | 2 +- .../geode/util/function/TriConsumerUnitTests.java | 2 +- .../geode/util/function/TupleConsumerUnitTests.java | 2 +- .../autoconfigure/GeodeHealthIndicatorAutoConfiguration.java | 2 +- .../config/BaseGeodeHealthIndicatorConfiguration.java | 2 +- .../config/ClientCacheHealthIndicatorConfiguration.java | 2 +- .../config/PeerCacheHealthIndicatorConfiguration.java | 2 +- ...eServerHealthIndicatorAutoConfigurationIntegrationTests.java | 2 +- .../boot/actuate/GeodeAsyncEventQueuesHealthIndicator.java | 2 +- .../geode/boot/actuate/GeodeCacheHealthIndicator.java | 2 +- .../geode/boot/actuate/GeodeCacheServersHealthIndicator.java | 2 +- .../boot/actuate/GeodeContinuousQueriesHealthIndicator.java | 2 +- .../geode/boot/actuate/GeodeDiskStoresHealthIndicator.java | 2 +- .../boot/actuate/GeodeGatewayReceiversHealthIndicator.java | 2 +- .../geode/boot/actuate/GeodeGatewaySendersHealthIndicator.java | 2 +- .../geode/boot/actuate/GeodeIndexesHealthIndicator.java | 2 +- .../geode/boot/actuate/GeodePoolsHealthIndicator.java | 2 +- .../geode/boot/actuate/GeodeRegionsHealthIndicator.java | 2 +- .../geode/boot/actuate/health/AbstractGeodeHealthIndicator.java | 2 +- .../actuate/health/support/ActuatorServerLoadProbeWrapper.java | 2 +- .../boot/actuate/health/support/RegionStatisticsResolver.java | 2 +- .../actuate/GeodeAsyncEventQueuesHealthIndicatorUnitTests.java | 2 +- .../geode/boot/actuate/GeodeCacheHealthIndicatorUnitTests.java | 2 +- .../boot/actuate/GeodeCacheServersHealthIndicatorUnitTests.java | 2 +- .../actuate/GeodeContinuousQueriesHealthIndicatorUnitTests.java | 2 +- .../boot/actuate/GeodeDiskStoresHealthIndicatorUnitTests.java | 2 +- .../actuate/GeodeGatewayReceiversHealthIndicatorUnitTests.java | 2 +- .../actuate/GeodeGatewaySendersHealthIndicatorUnitTests.java | 2 +- .../boot/actuate/GeodeIndexesHealthIndicatorUnitTests.java | 2 +- .../geode/boot/actuate/GeodePoolsHealthIndicatorUnitTests.java | 2 +- .../boot/actuate/GeodeRegionsHealthIndicatorUnitTests.java | 2 +- .../geode/boot/autoconfigure/CacheNameAutoConfiguration.java | 2 +- .../boot/autoconfigure/CachingProviderAutoConfiguration.java | 2 +- .../geode/boot/autoconfigure/ClientCacheAutoConfiguration.java | 2 +- .../boot/autoconfigure/ClientSecurityAutoConfiguration.java | 2 +- .../boot/autoconfigure/ContinuousQueryAutoConfiguration.java | 2 +- .../boot/autoconfigure/DataImportExportAutoConfiguration.java | 2 +- .../EnvironmentSourcedGemFirePropertiesAutoConfiguration.java | 2 +- .../boot/autoconfigure/FunctionExecutionAutoConfiguration.java | 2 +- .../boot/autoconfigure/GemFirePropertiesAutoConfiguration.java | 2 +- .../GemFireRepositoriesAutoConfigurationRegistrar.java | 2 +- .../geode/boot/autoconfigure/LoggingAutoConfiguration.java | 2 +- .../boot/autoconfigure/PdxSerializationAutoConfiguration.java | 2 +- .../geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java | 2 +- .../boot/autoconfigure/RegionTemplateAutoConfiguration.java | 2 +- .../geode/boot/autoconfigure/RepositoriesAutoConfiguration.java | 2 +- .../boot/autoconfigure/SpringSessionAutoConfiguration.java | 2 +- .../autoconfigure/SpringSessionPropertiesAutoConfiguration.java | 2 +- .../geode/boot/autoconfigure/SslAutoConfiguration.java | 2 +- .../autoconfigure/condition/ConditionalOnMissingProperty.java | 2 +- .../autoconfigure/condition/OnMissingPropertyCondition.java | 2 +- .../boot/autoconfigure/configuration/GemFireProperties.java | 2 +- .../autoconfigure/configuration/SpringSessionProperties.java | 2 +- .../autoconfigure/configuration/support/CacheProperties.java | 2 +- .../configuration/support/CacheServerProperties.java | 2 +- .../configuration/support/ClientCacheProperties.java | 2 +- .../configuration/support/ClientSecurityProperties.java | 2 +- .../autoconfigure/configuration/support/ClusterProperties.java | 2 +- .../configuration/support/DiskStoreProperties.java | 2 +- .../autoconfigure/configuration/support/EntityProperties.java | 2 +- .../autoconfigure/configuration/support/LocatorProperties.java | 2 +- .../autoconfigure/configuration/support/LoggingProperties.java | 2 +- .../configuration/support/ManagementProperties.java | 2 +- .../autoconfigure/configuration/support/ManagerProperties.java | 2 +- .../boot/autoconfigure/configuration/support/PdxProperties.java | 2 +- .../configuration/support/PeerCacheProperties.java | 2 +- .../configuration/support/PeerSecurityProperties.java | 2 +- .../autoconfigure/configuration/support/PoolProperties.java | 2 +- .../autoconfigure/configuration/support/SecurityProperties.java | 2 +- .../autoconfigure/configuration/support/ServiceProperties.java | 2 +- .../boot/autoconfigure/configuration/support/SslProperties.java | 2 +- .../springframework/geode/boot/autoconfigure/package-info.java | 2 +- .../autoconfigure/support/EnableSubscriptionConfiguration.java | 2 +- .../support/HttpBasicAuthenticationSecurityConfiguration.java | 2 +- .../autoconfigure/support/PdxInstanceWrapperRegionAspect.java | 2 +- .../src/test/java/example/app/books/NonBeanType.java | 2 +- .../src/test/java/example/app/books/model/Author.java | 2 +- .../src/test/java/example/app/books/model/Book.java | 2 +- .../src/test/java/example/app/books/model/ISBN.java | 2 +- .../src/test/java/example/app/books/repo/BookRepository.java | 2 +- .../src/test/java/example/app/books/service/BookService.java | 2 +- .../example/app/books/service/support/CachingBookService.java | 2 +- .../src/test/java/example/app/golf/model/Golfer.java | 2 +- .../test/java/example/app/library/service/LibraryService.java | 2 +- .../test/java/example/echo/config/EchoClientConfiguration.java | 2 +- .../test/java/example/echo/config/EchoServerConfiguration.java | 2 +- .../src/test/java/example/geode/cache/EchoCacheLoader.java | 2 +- .../java/example/geode/query/cq/event/TemperatureReading.java | 2 +- .../cq/event/TemperatureReadingsContinuousQueriesHandler.java | 2 +- .../test/java/example/geode/query/cq/event/TemperatureUnit.java | 2 +- .../java/example/java/lang/IntValueComparisonUnitTests.java | 2 +- .../example/java/lang/ObjectSerializationIntegrationTests.java | 2 +- .../example/java/lang/ObjectToStringWithOptionalUnitTests.java | 2 +- .../src/test/java/example/java/net/UrlRevealed.java | 2 +- .../test/java/example/test/service/TestCacheableService.java | 2 +- .../ComplexConditionalConfigurationIntegrationTests.java | 2 +- .../cache/CacheNameAutoConfigurationIntegrationTests.java | 2 +- .../client/ClientCachePoolCustomizationsIntegrationTests.java | 2 +- ...ngBootApacheGeodeClientCacheApplicationIntegrationTests.java | 2 +- ...ringBootApacheGeodePeerCacheApplicationIntegrationTests.java | 2 +- .../caching/AutoConfiguredCachingIntegrationTests.java | 2 +- .../autoconfigure/caching/AutoConfiguredCachingUnitTests.java | 2 +- .../caching/ManuallyConfiguredCachingIntegrationTests.java | 2 +- ...ManuallyConfiguredWithPropertiesCachingIntegrationTests.java | 2 +- .../aware/SecureClusterAwareConfigurationIntegrationTests.java | 2 +- .../ClusterConfigurationWithAuthenticationIntegrationTests.java | 2 +- ...usterAwareWhenNonSecureClusterAvailableIntegrationTests.java | 2 +- ...hClusterAwareWhenSecureClusterAvailableIntegrationTests.java | 2 +- .../condition/ConditionalOnMissingPropertyIntegrationTests.java | 2 +- ...mEnvironmentApplyToPeerCacheApplicationIntegrationTests.java | 2 +- ...pertiesFromEnvironmentAutoConfigurationIntegrationTests.java | 2 +- ...FirePropertiesFromEnvironmentAutoConfigurationUnitTests.java | 2 +- .../configuration/GemFirePropertiesIntegrationTests.java | 2 +- ...esVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java | 2 +- .../configuration/SpringSessionPropertiesIntegrationTests.java | 2 +- .../cq/AutoConfiguredContinuousQueryIntegrationTests.java | 2 +- .../data/CacheDataExportAutoConfigurationIntegrationTests.java | 2 +- ...tCacheDataImportExportAutoConfigurationIntegrationTests.java | 2 +- ...lClientCacheDataImportAutoConfigurationIntegrationTests.java | 2 +- .../data/RestServiceCacheDataImportExportIntegrationTests.java | 2 +- .../AutoConfiguredFunctionExecutionsIntegrationTests.java | 2 +- .../boot/autoconfigure/function/executions/Calculator.java | 2 +- .../locator/SpringBootLocatorApplicationIntegrationTests.java | 2 +- .../logging/LoggingAutoConfigurationIntegrationTests.java | 2 +- .../logging/LoggingManualConfigurationIntegrationTests.java | 2 +- ...erWithPdxSerializationAutoConfigurationIntegrationTests.java | 2 +- ...alizerPdxSerializationAutoConfigurationIntegrationTests.java | 2 +- .../pdx/PdxInstanceWrapperRegionAspectUnitTests.java | 2 +- ...alizerPdxSerializationAutoConfigurationIntegrationTests.java | 2 +- .../repository/AutoConfiguredRepositoriesIntegrationTests.java | 2 +- .../geode/boot/autoconfigure/repository/model/Customer.java | 2 +- .../boot/autoconfigure/repository/repo/CustomerRepository.java | 2 +- .../boot/autoconfigure/repository/service/CustomerService.java | 2 +- .../AbstractAutoConfiguredSecurityContextIntegrationTests.java | 2 +- .../security/auth/ClientSecurityAutoConfigurationUnitTests.java | 2 +- .../AutoConfiguredCloudSecurityContextIntegrationTests.java | 2 +- .../HttpBasicAuthenticationSecurityConfigurationUnitTests.java | 2 +- .../AutoConfiguredHybridSecurityContextIntegrationTests.java | 2 +- .../AutoConfiguredLocalSecurityContextIntegrationTests.java | 2 +- ...loudCacheServiceInstanceSecurityContextIntegrationTests.java | 2 +- .../security/ssl/AutoConfiguredSslIntegrationTests.java | 2 +- .../security/ssl/SslAutoConfigurationUnitTests.java | 2 +- .../AbstractTlsEnabledAutoConfigurationIntegrationTests.java | 2 +- .../tls/MockedTlsEnabledAutoConfigurationIntegrationTests.java | 2 +- .../tls/TlsEnabledAutoConfigurationIntegrationTests.java | 2 +- .../session/AutoConfiguredSessionCachingIntegrationTests.java | 2 +- ...dSessionCachingUsingRepositoryWithMocksIntegrationTests.java | 2 +- .../AutoConfiguredSessionLocalCachingIntegrationTests.java | 2 +- .../AutoConfiguredSessionRemoteCachingIntegrationTests.java | 2 +- .../session/CustomConfiguredSessionCachingIntegrationTests.java | 2 +- .../ManuallyConfiguredSessionCachingIntegrationTests.java | 2 +- ...yConfiguredWithPropertiesSessionCachingIntegrationTests.java | 2 +- .../NoAutoConfigurationOfSessionCachingIntegrationTests.java | 2 +- .../session/SessionExpirationIntegrationTests.java | 2 +- .../geode/boot/autoconfigure/suite/SslToNonSslTestSuite.java | 2 +- .../support/EnableSubscriptionConfigurationUnitTests.java | 2 +- ...gDefinedRegionTemplateAutoConfigurationIntegrationTests.java | 2 +- ...InjectedRegionTemplateAutoConfigurationIntegrationTests.java | 2 +- ...DeclaredRegionTemplateAutoConfigurationIntegrationTests.java | 2 +- ...yDefinedRegionTemplateAutoConfigurationIntegrationTests.java | 2 +- ...ngRegionTemplateByNameAutoConfigurationIntegrationTests.java | 2 +- ...RegionTemplateByRegionAutoConfigurationIntegrationTests.java | 2 +- ...eDefinedRegionTemplateAutoConfigurationIntegrationTests.java | 2 +- ...rDefinedRegionTemplateAutoConfigurationIntegrationTests.java | 2 +- .../SpringBootApacheGeodeClientServerIntegrationTests.java | 2 +- .../java/org/springframework/geode/cloud/bindings/Guards.java | 2 +- .../org/springframework/geode/cloud/bindings/MapMapper.java | 2 +- .../cloud/bindings/boot/GeodeBindingsPropertiesProcessor.java | 2 +- .../boot/GeodeBindingsPropertiesProcessorUnitTests.java | 2 +- .../app/client/SpringBootApacheGeodeClientCacheApplication.java | 2 +- .../SpringBootApacheGeodeDockerClientCacheApplication.java | 2 +- .../geode/docs/example/app/docker/model/Customer.java | 2 +- .../geode/docs/example/app/docker/repo/CustomerRepository.java | 2 +- .../app/locator/SpringBootApacheGeodeLocatorApplication.java | 2 +- .../app/server/SpringBootApacheGeodeCacheServerApplication.java | 2 +- .../test/integration/SpringBootApacheGeodeIntegrationTest.java | 2 +- .../java/example/test/unit/SpringBootApacheGeodeUnitTest.java | 2 +- .../java/example/app/temp/event/BoilingTemperatureEvent.java | 2 +- .../java/example/app/temp/event/FreezingTemperatureEvent.java | 2 +- .../src/main/java/example/app/temp/event/TemperatureEvent.java | 2 +- .../app/temp/geode/client/BootGeodeClientApplication.java | 2 +- .../app/temp/geode/server/BootGeodeServerApplication.java | 2 +- .../main/java/example/app/temp/model/TemperatureReading.java | 2 +- .../example/app/temp/repo/TemperatureReadingRepository.java | 2 +- .../main/java/example/app/temp/service/TemperatureMonitor.java | 2 +- .../main/java/example/app/temp/service/TemperatureSensor.java | 2 +- .../main/java/example/app/crm/CustomerServiceApplication.java | 2 +- .../src/main/java/example/app/crm/model/Customer.java | 2 +- .../src/main/java/example/app/crm/repo/CustomerRepository.java | 2 +- .../app/crm/CustomerServiceApplicationIntegrationTests.java | 2 +- .../java/example/app/crm/support/GemFireDebugConfiguration.java | 2 +- .../app/security/client/BootGeodeSecurityClientApplication.java | 2 +- .../app/security/client/controller/SecurityController.java | 2 +- .../main/java/example/app/security/client/model/Customer.java | 2 +- .../app/security/server/BootGeodeSecurityServerApplication.java | 2 +- .../BootGeodeSecurityClientApplicationIntegrationTests.java | 2 +- .../session/http/BootGeodeHttpSessionCachingApplication.java | 2 +- .../app/caching/session/http/controller/CounterController.java | 2 +- .../BootGeodeHttpSessionCachingApplicationIntegrationTests.java | 2 +- .../client/BootGeodeAsyncInlineCachingClientApplication.java | 2 +- .../app/caching/inline/async/client/model/GolfCourse.java | 2 +- .../app/caching/inline/async/client/model/GolfTournament.java | 2 +- .../example/app/caching/inline/async/client/model/Golfer.java | 2 +- .../inline/async/client/model/support/GolfCourseBuilder.java | 2 +- .../inline/async/client/model/support/GolferBuilder.java | 2 +- .../app/caching/inline/async/client/repo/GolferRepository.java | 2 +- .../app/caching/inline/async/client/service/GolferService.java | 2 +- .../app/caching/inline/async/client/service/PgaTourService.java | 2 +- .../app/caching/inline/async/client/web/GolferController.java | 2 +- .../inline/async/config/AsyncInlineCachingConfiguration.java | 2 +- .../async/config/AsyncInlineCachingRegionConfiguration.java | 2 +- .../server/BootGeodeAsyncInlineCachingServerApplication.java | 2 +- .../AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java | 2 +- ...nlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java | 2 +- .../app/caching/inline/BootGeodeInlineCachingApplication.java | 2 +- .../app/caching/inline/config/CalculatorConfiguration.java | 2 +- .../app/caching/inline/controller/CalculatorController.java | 2 +- .../main/java/example/app/caching/inline/model/Operator.java | 2 +- .../java/example/app/caching/inline/model/ResultHolder.java | 2 +- .../example/app/caching/inline/repo/CalculatorRepository.java | 2 +- .../example/app/caching/inline/service/CalculatorService.java | 2 +- .../inline/service/support/AbstractCacheableService.java | 2 +- .../caching/inline/CalculatorApplicationIntegrationTests.java | 2 +- .../caching/lookaside/BootGeodeLookAsideCachingApplication.java | 2 +- .../app/caching/lookaside/config/GeodeConfiguration.java | 2 +- .../app/caching/lookaside/controller/CounterController.java | 2 +- .../example/app/caching/lookaside/service/CounterService.java | 2 +- .../BootGeodeLookAsideCachingApplicationIntegrationTests.java | 2 +- .../client/BootGeodeMultiSiteCachingClientApplication.java | 2 +- .../example/app/caching/multisite/client/model/Customer.java | 2 +- .../app/caching/multisite/client/service/CustomerService.java | 2 +- .../example/app/caching/multisite/client/util/ThreadUtils.java | 2 +- .../app/caching/multisite/client/web/CustomerController.java | 2 +- .../server/BootGeodeMultiSiteCachingServerApplication.java | 2 +- .../app/caching/multisite/MultiSiteCachingIntegrationTests.java | 2 +- .../near/client/BootGeodeNearCachingClientCacheApplication.java | 2 +- .../app/caching/near/client/config/GeodeConfiguration.java | 2 +- .../caching/near/client/controller/YellowPagesController.java | 2 +- .../main/java/example/app/caching/near/client/model/Person.java | 2 +- .../app/caching/near/client/service/YellowPagesService.java | 2 +- .../near/client/service/support/AbstractCacheableService.java | 2 +- .../app/caching/near/client/service/support/EmailGenerator.java | 2 +- .../near/client/service/support/PhoneNumberGenerator.java | 2 +- .../near/server/BootGeodeNearCachingCacheServerApplication.java | 2 +- ...tGeodeNearCachingClientCacheApplicationIntegrationTests.java | 2 +- .../src/main/java/example/app/crm/CrmApplication.java | 2 +- .../main/java/example/app/crm/config/CustomerConfiguration.java | 2 +- .../java/example/app/crm/controller/CustomerController.java | 2 +- .../src/main/java/example/app/crm/model/Customer.java | 2 +- .../src/main/java/example/app/crm/repo/CustomerRepository.java | 2 +- .../java/example/app/crm/CrmApplicationIntegrationTests.java | 2 +- .../src/main/java/example/app/user/UserApplication.java | 2 +- .../java/example/app/user/UserApplicationIntegrationTests.java | 2 +- .../geode/logging/slf4j/logback/CompositeAppender.java | 2 +- .../geode/logging/slf4j/logback/DelegatingAppender.java | 2 +- .../geode/logging/slf4j/logback/StringAppender.java | 2 +- .../geode/logging/slf4j/logback/support/LogbackSupport.java | 2 +- .../logging/slf4j/logback/AbstractLoggingIntegrationTests.java | 2 +- .../geode/logging/slf4j/logback/CompositeAppenderUnitTests.java | 2 +- .../logging/slf4j/logback/DebugLoggingIntegrationTests.java | 2 +- .../logging/slf4j/logback/DelegatingAppenderUnitTests.java | 2 +- .../logging/slf4j/logback/InfoLoggingIntegrationTests.java | 2 +- .../geode/logging/slf4j/logback/NoLoggingIntegrationTests.java | 2 +- .../geode/logging/slf4j/logback/StringAppenderUnitTests.java | 2 +- .../app/petclinic/function/PetServiceFunctionExecutions.java | 2 +- .../src/main/java/example/app/petclinic/model/Pet.java | 2 +- .../src/main/java/example/app/petclinic/repo/PetRepository.java | 2 +- .../example/app/petclinic/PetClinicApplicationSmokeTests.java | 2 +- .../app/geode/locator/ApacheGeodeLocatorApplication.java | 2 +- .../geode/locator/SpringBootApacheGeodeLocatorApplication.java | 2 +- .../SpringBootApacheGeodeLocatorApplicationSmokeTests.java | 2 +- .../app/geode/logging/ApacheGeodeLoggingApplication.java | 2 +- .../geode/logging/ApacheGeodeLoggingApplicationSmokeTests.java | 2 +- ...bstractSpringConfiguredLogLevelPropertyIntegrationTests.java | 2 +- ...tDataGemFireLogLevelApplicationPropertyIntegrationTests.java | 2 +- ...ngBootDataGemFireLogLevelSystemPropertyIntegrationTests.java | 2 +- ...GemFireCacheLogLevelApplicationPropertyIntegrationTests.java | 2 +- ...gDataGemFireCacheLogLevelSystemPropertyIntegrationTests.java | 2 +- ...aGemFireLoggingLevelApplicationPropertyIntegrationTests.java | 2 +- ...ngDataGemFireLoggingLevelSystemPropertyIntegrationTests.java | 2 +- .../main/java/org/springframework/hamcrest/RegexMatcher.java | 2 +- .../org/springframework/security/AuthenticationException.java | 2 +- .../session/web/servlet/http/HttpSessionAdapter.java | 2 +- .../springframework/session/web/servlet/http/SessionUtils.java | 2 +- .../http/SpringSessionSubstitutingSpyRequestPostProcessor.java | 2 +- .../springframework/web/servlet/http/AbstractHttpSession.java | 2 +- .../org/springframework/web/servlet/http/HttpSessionProxy.java | 2 +- .../caching/session/MockPersistentSessionAccessSmokeTests.java | 2 +- .../example/app/DatabaseWithLookAsideCachingApplication.java | 2 +- .../multi-store/src/main/java/example/app/model/Contact.java | 2 +- .../src/main/java/example/app/repo/ContactRepository.java | 2 +- .../src/main/java/example/app/service/ContactsService.java | 2 +- .../app/DatabaseWithLookAsideCachingApplicationSmokeTests.java | 2 +- .../cache/peer/SpringBootApacheGeodePeerCacheApplication.java | 2 +- .../SpringBootApacheGeodePeerCacheApplicationUnitTests.java | 2 +- .../src/main/java/example/app/InitializerApplication.java | 2 +- .../test/java/example/app/InitializerApplicationSmokeTests.java | 2 +- .../geode/cache/AsyncInlineCachingRegionConfigurer.java | 2 +- .../geode/cache/InlineCachingRegionConfigurer.java | 2 +- .../geode/cache/RepositoryAsyncEventListener.java | 2 +- .../org/springframework/geode/cache/RepositoryCacheLoader.java | 2 +- .../geode/cache/RepositoryCacheLoaderRegionConfigurer.java | 2 +- .../org/springframework/geode/cache/RepositoryCacheWriter.java | 2 +- .../geode/cache/RepositoryCacheWriterRegionConfigurer.java | 2 +- .../springframework/geode/cache/support/CacheLoaderSupport.java | 2 +- .../springframework/geode/cache/support/CacheWriterSupport.java | 2 +- .../geode/cache/support/RepositoryCacheLoaderWriterSupport.java | 2 +- .../geode/config/annotation/ClusterAvailableConfiguration.java | 2 +- .../geode/config/annotation/ClusterAwareConfiguration.java | 2 +- .../config/annotation/ClusterNotAvailableConfiguration.java | 2 +- .../geode/config/annotation/ClusterNotAvailableException.java | 2 +- .../config/annotation/DistributedSystemIdConfiguration.java | 2 +- .../geode/config/annotation/DurableClientConfiguration.java | 2 +- .../geode/config/annotation/EnableClusterAware.java | 2 +- .../geode/config/annotation/EnableDurableClient.java | 2 +- .../geode/config/annotation/EnableSecurityManager.java | 2 +- .../geode/config/annotation/EnableSecurityManagerProxy.java | 2 +- .../geode/config/annotation/GroupsConfiguration.java | 2 +- .../geode/config/annotation/LocatorsConfiguration.java | 2 +- .../geode/config/annotation/MemberNameConfiguration.java | 2 +- .../geode/config/annotation/SecurityManagerConfiguration.java | 2 +- .../config/annotation/SecurityManagerProxyConfiguration.java | 2 +- .../geode/config/annotation/UseDistributedSystemId.java | 2 +- .../org/springframework/geode/config/annotation/UseGroups.java | 2 +- .../springframework/geode/config/annotation/UseLocators.java | 2 +- .../springframework/geode/config/annotation/UseMemberName.java | 2 +- .../annotation/support/TypelessAnnotationConfigSupport.java | 2 +- .../RefreshableAnnotationConfigApplicationContext.java | 2 +- .../context/logging/EnvironmentLoggingApplicationListener.java | 2 +- .../geode/context/logging/GeodeLoggingApplicationListener.java | 2 +- .../springframework/geode/core/env/EnvironmentMapAdapter.java | 2 +- .../org/springframework/geode/core/env/VcapPropertySource.java | 2 +- .../geode/core/env/support/CloudCacheService.java | 2 +- .../org/springframework/geode/core/env/support/Service.java | 2 +- .../java/org/springframework/geode/core/env/support/User.java | 2 +- .../springframework/geode/core/io/AbstractResourceReader.java | 2 +- .../springframework/geode/core/io/AbstractResourceWriter.java | 2 +- .../geode/core/io/ResourceDataAccessException.java | 2 +- .../geode/core/io/ResourceNotFoundException.java | 2 +- .../springframework/geode/core/io/ResourceReadException.java | 2 +- .../java/org/springframework/geode/core/io/ResourceReader.java | 2 +- .../org/springframework/geode/core/io/ResourceResolver.java | 2 +- .../springframework/geode/core/io/ResourceWriteException.java | 2 +- .../java/org/springframework/geode/core/io/ResourceWriter.java | 2 +- .../geode/core/io/UnhandledResourceException.java | 2 +- .../geode/core/io/support/ByteArrayResourceReader.java | 2 +- .../geode/core/io/support/FileResourceWriter.java | 2 +- .../geode/core/io/support/ResourceLoaderResourceResolver.java | 2 +- .../springframework/geode/core/io/support/ResourcePrefix.java | 2 +- .../springframework/geode/core/io/support/ResourceUtils.java | 2 +- .../geode/core/io/support/SingleResourceResolver.java | 2 +- .../org/springframework/geode/core/util/ObjectAwareUtils.java | 2 +- .../java/org/springframework/geode/core/util/ObjectUtils.java | 2 +- .../org/springframework/geode/core/util/SpringExtensions.java | 2 +- .../springframework/geode/core/util/function/FunctionUtils.java | 2 +- .../geode/data/AbstractCacheDataImporterExporter.java | 2 +- .../java/org/springframework/geode/data/CacheDataExporter.java | 2 +- .../java/org/springframework/geode/data/CacheDataImporter.java | 2 +- .../springframework/geode/data/CacheDataImporterExporter.java | 2 +- .../geode/data/json/JsonCacheDataImporterExporter.java | 2 +- .../data/json/converter/AbstractObjectArrayToJsonConverter.java | 2 +- .../geode/data/json/converter/JsonToObjectArrayConverter.java | 2 +- .../geode/data/json/converter/JsonToObjectConverter.java | 2 +- .../geode/data/json/converter/JsonToPdxArrayConverter.java | 2 +- .../geode/data/json/converter/JsonToPdxConverter.java | 2 +- .../geode/data/json/converter/ObjectArrayToJsonConverter.java | 2 +- .../geode/data/json/converter/ObjectToJsonConverter.java | 2 +- .../json/converter/support/JSONFormatterJsonToPdxConverter.java | 2 +- .../json/converter/support/JSONFormatterPdxToJsonConverter.java | 2 +- .../json/converter/support/JacksonJsonToObjectConverter.java | 2 +- .../data/json/converter/support/JacksonJsonToPdxConverter.java | 2 +- .../json/converter/support/JacksonObjectToJsonConverter.java | 2 +- .../data/support/LifecycleAwareCacheDataImporterExporter.java | 2 +- .../data/support/ResourceCapableCacheDataImporterExporter.java | 2 +- .../distributed/event/ApplicationContextMembershipListener.java | 2 +- .../geode/expression/SmartEnvironmentAccessor.java | 2 +- .../AbstractFunctionExecutionAutoConfigurationExtension.java | 2 +- .../GemFireFunctionExecutionAutoConfigurationRegistrar.java | 2 +- .../geode/function/support/AbstractResultCollector.java | 2 +- .../geode/function/support/SingleResultReturningCollector.java | 2 +- .../geode/jackson/databind/serializer/BigDecimalSerializer.java | 2 +- .../geode/jackson/databind/serializer/BigIntegerSerializer.java | 2 +- .../databind/serializer/TypelessCollectionSerializer.java | 2 +- .../geode/pdx/MappingPdxSerializerIncludedTypesRegistrar.java | 2 +- .../org/springframework/geode/pdx/ObjectPdxInstanceAdapter.java | 2 +- .../geode/security/support/SecurityManagerProxy.java | 2 +- .../geode/security/support/SecurityManagerSupport.java | 2 +- .../test/context/TestRefreshableApplicationContextLoader.java | 2 +- .../java/example/app/crm/config/TestCassandraConfiguration.java | 2 +- .../app/crm/config/TestcontainersCassandraConfiguration.java | 2 +- spring-geode/src/test/java/example/app/crm/model/Customer.java | 2 +- .../src/test/java/example/app/crm/repo/CustomerRepository.java | 2 +- .../src/test/java/example/app/crm/service/CustomerService.java | 2 +- .../example/app/env/EnvironmentUsingSpringBootApplication.java | 2 +- spring-geode/src/test/java/example/app/pos/model/LineItem.java | 2 +- spring-geode/src/test/java/example/app/pos/model/Product.java | 2 +- .../src/test/java/example/app/pos/model/PurchaseOrder.java | 2 +- .../AsyncInlineCachingRegionConfigurerIntegrationTests.java | 2 +- .../cache/AsyncInlineCachingRegionConfigurerUnitTests.java | 2 +- ...FunctionAndCustomAsyncEventErrorHandlerIntegrationTests.java | 2 +- .../geode/cache/InlineCachingRegionConfigurerUnitTests.java | 2 +- .../geode/cache/RepositoryAsyncEventListenerUnitTests.java | 2 +- .../cache/RepositoryCacheLoaderRegionConfigurerUnitTests.java | 2 +- .../geode/cache/RepositoryCacheLoaderUnitTests.java | 2 +- .../cache/RepositoryCacheWriterRegionConfigurerUnitTests.java | 2 +- .../geode/cache/RepositoryCacheWriterUnitTests.java | 2 +- .../geode/cache/SpringCachingWithMockObjectsUnitTests.java | 2 +- ...ractInlineCachingWithExternalDataSourceIntegrationTests.java | 2 +- .../cassandra/InlineCachingWithCassandraIntegrationTests.java | 2 +- .../database/InlineCachingWithDatabaseIntegrationTests.java | 2 +- .../support/RepositoryCacheLoaderWriterSupportUnitTests.java | 2 +- ...FoundryClusterNotAvailableConfigurationIntegrationTests.java | 2 +- .../ClusterAvailableConfigurationIntegrationTests.java | 2 +- .../config/annotation/ClusterAwareConfigurationUnitTests.java | 2 +- .../ClusterNotAvailableConfigurationIntegrationTests.java | 2 +- .../DistributedSystemIdConfigurationIntegrationTests.java | 2 +- .../annotation/DurableClientConfigurationIntegrationTests.java | 2 +- .../config/annotation/GroupsConfigurationIntegrationTests.java | 2 +- ...ernetesClusterNotAvailableConfigurationIntegrationTests.java | 2 +- .../annotation/LocatorsConfigurationIntegrationTests.java | 2 +- .../annotation/MemberNameConfigurationIntegrationTests.java | 2 +- .../MemberNameOverridesCacheNameIntegrationTests.java | 2 +- ...atchingClusterNotAvailableConfigurationIntegrationTests.java | 2 +- .../SecurityManagerConfigurationIntegrationTests.java | 2 +- ...atchingClusterNotAvailableConfigurationIntegrationTests.java | 2 +- ...hableAnnotationConfigApplicationContextIntegrationTests.java | 2 +- .../logging/EnvironmentLoggingApplicationListenerUnitTests.java | 2 +- .../logging/GeodeLoggingApplicationListenerUnitTests.java | 2 +- .../geode/core/env/EnvironmentMapAdapterUnitTests.java | 2 +- .../geode/core/env/VcapPropertySourceUnitTests.java | 2 +- .../geode/core/env/support/CloudCacheServiceUnitTests.java | 2 +- .../geode/core/env/support/ServiceUnitTests.java | 2 +- .../springframework/geode/core/env/support/UserUnitTests.java | 2 +- .../geode/core/io/AbstractResourceReaderUnitTests.java | 2 +- .../geode/core/io/AbstractResourceWriterUnitTests.java | 2 +- .../springframework/geode/core/io/ResourceReaderUnitTests.java | 2 +- .../geode/core/io/ResourceResolverUnitTests.java | 2 +- .../springframework/geode/core/io/ResourceWriterUnitTests.java | 2 +- .../geode/core/io/support/ByteArrayResourceReaderUnitTests.java | 2 +- .../geode/core/io/support/FileResourceWriterUnitTests.java | 2 +- .../io/support/ResourceLoaderResourceResolverUnitTests.java | 2 +- .../geode/core/io/support/ResourcePrefixUnitTests.java | 2 +- .../geode/core/io/support/ResourceUtilsUnitTests.java | 2 +- .../geode/core/io/support/SingleResourceResolverUnitTests.java | 2 +- .../geode/core/util/ObjectAwareUtilsUnitTests.java | 2 +- .../springframework/geode/core/util/ObjectUtilsUnitTests.java | 2 +- .../geode/core/util/SpringExtensionsUnitTests.java | 2 +- .../geode/core/util/function/FunctionUtilsUnitTests.java | 2 +- .../geode/data/AbstractCacheDataImporterExporterUnitTests.java | 2 +- .../springframework/geode/data/CacheDataExporterUnitTests.java | 2 +- .../springframework/geode/data/CacheDataImporterUnitTests.java | 2 +- .../json/JsonCacheDataImporterExporterIntegrationTests.java | 2 +- .../geode/data/json/JsonCacheDataImporterExporterUnitTests.java | 2 +- .../JsonClientCacheDataImporterExporterIntegrationTests.java | 2 +- .../converter/AbstractObjectArrayToJsonConverterUnitTests.java | 2 +- .../json/converter/JsonToObjectArrayConverterUnitTests.java | 2 +- .../data/json/converter/JsonToObjectConverterUnitTests.java | 2 +- .../data/json/converter/JsonToPdxArrayConverterUnitTests.java | 2 +- .../geode/data/json/converter/JsonToPdxConverterUnitTests.java | 2 +- .../json/converter/ObjectArrayToJsonConverterUnitTests.java | 2 +- .../support/JSONFormatterJsonToPdxConverterUnitTests.java | 2 +- .../support/JSONFormatterPdxToJsonConverterUnitTests.java | 2 +- .../support/JacksonJsonToObjectConverterUnitTests.java | 2 +- .../converter/support/JacksonJsonToPdxConverterUnitTests.java | 2 +- .../support/JacksonObjectToJsonConverterUnitTests.java | 2 +- .../LifecycleAwareCacheDataImporterExporterUnitTests.java | 2 +- .../ResourceCapableCacheDataImporterExporterUnitTests.java | 2 +- .../event/ApplicationContextMembershipListenerUnitTests.java | 2 +- .../geode/expression/SmartEnvironmentAccessorUnitTests.java | 2 +- .../function/support/AbstractResultCollectorUnitTests.java | 2 +- .../support/SingleResultReturningCollectorUnitTests.java | 2 +- .../MappingPdxSerializerIncludedTypesRegistrarUnitTests.java | 2 +- .../geode/pdx/ObjectPdxInstanceAdapterUnitTests.java | 2 +- .../security/support/SecurityManagerProxyIntegrationTests.java | 2 +- .../geode/security/support/SecurityManagerProxyUnitTests.java | 2 +- ...TestRefreshableApplicationContextLoaderIntegrationTests.java | 2 +- 511 files changed, 511 insertions(+), 511 deletions(-) diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/cache/AbstractCommonEventProcessingCacheListener.java b/apache-geode-extensions/src/main/java/org/springframework/geode/cache/AbstractCommonEventProcessingCacheListener.java index 96c572c23..4d1594449 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/cache/AbstractCommonEventProcessingCacheListener.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/cache/AbstractCommonEventProcessingCacheListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/cache/SimpleCacheResolver.java b/apache-geode-extensions/src/main/java/org/springframework/geode/cache/SimpleCacheResolver.java index f8bd16366..a0559ba73 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/cache/SimpleCacheResolver.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/cache/SimpleCacheResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/MembershipEvent.java b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/MembershipEvent.java index 3d0abba14..fd0e2ea49 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/MembershipEvent.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/MembershipEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/MembershipListenerAdapter.java b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/MembershipListenerAdapter.java index eee24418e..daedcc09c 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/MembershipListenerAdapter.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/MembershipListenerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberDepartedEvent.java b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberDepartedEvent.java index ffec983d2..0f2e869e7 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberDepartedEvent.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberDepartedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberJoinedEvent.java b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberJoinedEvent.java index 9e1acfa50..26122a4d5 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberJoinedEvent.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberJoinedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberSuspectEvent.java b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberSuspectEvent.java index a003b31f0..0f74d0366 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberSuspectEvent.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/MemberSuspectEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/QuorumLostEvent.java b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/QuorumLostEvent.java index a4b91bf40..6bce54095 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/QuorumLostEvent.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/distributed/event/support/QuorumLostEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxFieldNotWritableException.java b/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxFieldNotWritableException.java index 0839f5f46..ddb8f133e 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxFieldNotWritableException.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxFieldNotWritableException.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceBuilder.java b/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceBuilder.java index 66799cbb2..514fbd0ec 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceBuilder.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceWrapper.java b/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceWrapper.java index c8133755e..e7df051df 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceWrapper.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/security/TestAuthInitialize.java b/apache-geode-extensions/src/main/java/org/springframework/geode/security/TestAuthInitialize.java index ece79c162..d36ad37cd 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/security/TestAuthInitialize.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/security/TestAuthInitialize.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/security/TestSecurityManager.java b/apache-geode-extensions/src/main/java/org/springframework/geode/security/TestSecurityManager.java index 8b41623bb..53b9c3b34 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/security/TestSecurityManager.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/security/TestSecurityManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/util/CacheUtils.java b/apache-geode-extensions/src/main/java/org/springframework/geode/util/CacheUtils.java index 8dfd411dd..6443bbd9c 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/util/CacheUtils.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/util/CacheUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeAssertions.java b/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeAssertions.java index bf0fba850..42a79e9d3 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeAssertions.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeAssertions.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeConstants.java b/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeConstants.java index 65626ae4b..8bdd1cb9b 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeConstants.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/InvocationArguments.java b/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/InvocationArguments.java index e5fdbec92..43201bdaa 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/InvocationArguments.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/InvocationArguments.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/TriConsumer.java b/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/TriConsumer.java index bc0ed07e0..997211088 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/TriConsumer.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/TriConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/TupleConsumer.java b/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/TupleConsumer.java index 687c690bd..cda79ef3f 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/TupleConsumer.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/util/function/TupleConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/app/ApacheGeodeClientApplication.java b/apache-geode-extensions/src/test/java/org/springframework/geode/app/ApacheGeodeClientApplication.java index 06c3640cb..4bbc4a41a 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/app/ApacheGeodeClientApplication.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/app/ApacheGeodeClientApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/AbstractCommonEventProcessingCacheListenerUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/AbstractCommonEventProcessingCacheListenerUnitTests.java index af7b7d15b..f220c3538 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/AbstractCommonEventProcessingCacheListenerUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/AbstractCommonEventProcessingCacheListenerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleCacheResolverUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleCacheResolverUnitTests.java index eb2c7fb43..f0cf3d0e6 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleCacheResolverUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleCacheResolverUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleClientCacheResolverIntegrationTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleClientCacheResolverIntegrationTests.java index 094e260f8..982ce0996 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleClientCacheResolverIntegrationTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleClientCacheResolverIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimplePeerCacheResolverIntegrationTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimplePeerCacheResolverIntegrationTests.java index e6905e7ce..b0a7f642c 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimplePeerCacheResolverIntegrationTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimplePeerCacheResolverIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/MembershipEventUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/MembershipEventUnitTests.java index 22543b72e..1d7e78868 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/MembershipEventUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/MembershipEventUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/MembershipListenerAdapterUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/MembershipListenerAdapterUnitTests.java index 4e5f7ef88..e2bd5ef18 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/MembershipListenerAdapterUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/MembershipListenerAdapterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberDepartedEventUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberDepartedEventUnitTests.java index 1c937d2e7..b8b7081d9 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberDepartedEventUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberDepartedEventUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberJoinedEventUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberJoinedEventUnitTests.java index 6e6efd119..0a1e13c9f 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberJoinedEventUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberJoinedEventUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberSuspectEventUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberSuspectEventUnitTests.java index 15c811ce4..035b04ef0 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberSuspectEventUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/MemberSuspectEventUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/QuorumLostEventUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/QuorumLostEventUnitTests.java index 6e0e32656..b52cf34ba 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/QuorumLostEventUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/distributed/event/support/QuorumLostEventUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/pdx/PdxInstanceBuilderUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/pdx/PdxInstanceBuilderUnitTests.java index a045ff06b..a0cf624ee 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/pdx/PdxInstanceBuilderUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/pdx/PdxInstanceBuilderUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/pdx/PdxInstanceWrapperUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/pdx/PdxInstanceWrapperUnitTests.java index 8b3da98dd..854795f52 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/pdx/PdxInstanceWrapperUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/pdx/PdxInstanceWrapperUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/security/TestAuthInitializeUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/security/TestAuthInitializeUnitTests.java index fe0cfdf85..daee2d22c 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/security/TestAuthInitializeUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/security/TestAuthInitializeUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/security/TestSecurityManagerUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/security/TestSecurityManagerUnitTests.java index 00922d9c6..0689f7c4f 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/security/TestSecurityManagerUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/security/TestSecurityManagerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/util/CacheUtilsUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/util/CacheUtilsUnitTests.java index 9054f7fcf..609d5eba4 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/util/CacheUtilsUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/util/CacheUtilsUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/InvocationArgumentsUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/InvocationArgumentsUnitTests.java index 7e93e3f70..a82c4e9b9 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/InvocationArgumentsUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/InvocationArgumentsUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/TriConsumerUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/TriConsumerUnitTests.java index c80093126..50fbb41a9 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/TriConsumerUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/TriConsumerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/TupleConsumerUnitTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/TupleConsumerUnitTests.java index 81c7a1ab4..4e3805692 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/TupleConsumerUnitTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/util/function/TupleConsumerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeHealthIndicatorAutoConfiguration.java b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeHealthIndicatorAutoConfiguration.java index e478d84c8..85b8198dd 100644 --- a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeHealthIndicatorAutoConfiguration.java +++ b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeHealthIndicatorAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/BaseGeodeHealthIndicatorConfiguration.java b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/BaseGeodeHealthIndicatorConfiguration.java index 7523ebeeb..242c4f9c2 100644 --- a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/BaseGeodeHealthIndicatorConfiguration.java +++ b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/BaseGeodeHealthIndicatorConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/ClientCacheHealthIndicatorConfiguration.java b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/ClientCacheHealthIndicatorConfiguration.java index 57156f742..3a1f9a9c8 100644 --- a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/ClientCacheHealthIndicatorConfiguration.java +++ b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/ClientCacheHealthIndicatorConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/PeerCacheHealthIndicatorConfiguration.java b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/PeerCacheHealthIndicatorConfiguration.java index c34b1fc86..34568e8f6 100644 --- a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/PeerCacheHealthIndicatorConfiguration.java +++ b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/PeerCacheHealthIndicatorConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator-autoconfigure/src/test/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeCacheServerHealthIndicatorAutoConfigurationIntegrationTests.java b/spring-geode-actuator-autoconfigure/src/test/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeCacheServerHealthIndicatorAutoConfigurationIntegrationTests.java index 94ff2666c..7fdcad9cb 100644 --- a/spring-geode-actuator-autoconfigure/src/test/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeCacheServerHealthIndicatorAutoConfigurationIntegrationTests.java +++ b/spring-geode-actuator-autoconfigure/src/test/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeCacheServerHealthIndicatorAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeAsyncEventQueuesHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeAsyncEventQueuesHealthIndicator.java index 5e2518e98..0dce3d904 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeAsyncEventQueuesHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeAsyncEventQueuesHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicator.java index a078c0712..e2a5103ca 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheServersHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheServersHealthIndicator.java index 5ae3f9d62..9743ee16f 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheServersHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheServersHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeContinuousQueriesHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeContinuousQueriesHealthIndicator.java index e1060e410..7b7d59a16 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeContinuousQueriesHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeContinuousQueriesHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicator.java index 5eb53eb8b..74b56a9dd 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeGatewayReceiversHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeGatewayReceiversHealthIndicator.java index 84e950aaf..2ef646414 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeGatewayReceiversHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeGatewayReceiversHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeGatewaySendersHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeGatewaySendersHealthIndicator.java index b03b00fc0..4b1bcbbdc 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeGatewaySendersHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeGatewaySendersHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicator.java index e3d1a4942..c8e8e54bd 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodePoolsHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodePoolsHealthIndicator.java index 71f71f60a..3a9f5428c 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodePoolsHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodePoolsHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeRegionsHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeRegionsHealthIndicator.java index 09138d292..f01524d88 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeRegionsHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeRegionsHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/AbstractGeodeHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/AbstractGeodeHealthIndicator.java index 30e5db053..c7ed45834 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/AbstractGeodeHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/AbstractGeodeHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/support/ActuatorServerLoadProbeWrapper.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/support/ActuatorServerLoadProbeWrapper.java index 1d4545ce3..3b92561d6 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/support/ActuatorServerLoadProbeWrapper.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/support/ActuatorServerLoadProbeWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/support/RegionStatisticsResolver.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/support/RegionStatisticsResolver.java index 1758e62a6..b6129e10a 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/support/RegionStatisticsResolver.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/health/support/RegionStatisticsResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeAsyncEventQueuesHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeAsyncEventQueuesHealthIndicatorUnitTests.java index 568e4733b..d14514d2f 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeAsyncEventQueuesHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeAsyncEventQueuesHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicatorUnitTests.java index 14ee4a17b..1090e6b75 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheServersHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheServersHealthIndicatorUnitTests.java index 11c840954..523bc5c7d 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheServersHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheServersHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeContinuousQueriesHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeContinuousQueriesHealthIndicatorUnitTests.java index 07886cce7..06af39486 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeContinuousQueriesHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeContinuousQueriesHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicatorUnitTests.java index b5bdcad37..73fe868d5 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeGatewayReceiversHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeGatewayReceiversHealthIndicatorUnitTests.java index adf642537..0ebb5297b 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeGatewayReceiversHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeGatewayReceiversHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeGatewaySendersHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeGatewaySendersHealthIndicatorUnitTests.java index 61566f242..5b7917b41 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeGatewaySendersHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeGatewaySendersHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicatorUnitTests.java index d4278e852..3e47b1913 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodePoolsHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodePoolsHealthIndicatorUnitTests.java index 181cab861..513d8b3e0 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodePoolsHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodePoolsHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeRegionsHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeRegionsHealthIndicatorUnitTests.java index 69fd8ebac..61644947f 100644 --- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeRegionsHealthIndicatorUnitTests.java +++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeRegionsHealthIndicatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java index da4c839d0..b22b3c7e2 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java index 0b6c08dff..b31742738 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java index cd88b68b5..ed9578b5b 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java index 4fc90a9ef..282c91e96 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java index 578f301b0..07d3fba48 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java index 145efcb2f..cc065fc97 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java index 705040e81..b5397c9f0 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java index b770c1224..0436998ad 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java index 04bba1658..c2ae7e1c6 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java index 87d98e744..73611893a 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/LoggingAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/LoggingAutoConfiguration.java index 0ee9fe65e..b0beae266 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/LoggingAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/LoggingAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PdxSerializationAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PdxSerializationAutoConfiguration.java index 566a0994f..76866e233 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PdxSerializationAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PdxSerializationAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java index f414dd9bf..c030939db 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java index e01073871..c24b823c5 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java index 249304f6c..fe01c871a 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java index f7049ca29..622c27ef7 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionPropertiesAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionPropertiesAutoConfiguration.java index 2d69068b0..6749edf40 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionPropertiesAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionPropertiesAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java index 8656c660e..b627211ff 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/ConditionalOnMissingProperty.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/ConditionalOnMissingProperty.java index 5b60e58c3..296b195ff 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/ConditionalOnMissingProperty.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/ConditionalOnMissingProperty.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/OnMissingPropertyCondition.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/OnMissingPropertyCondition.java index cdfb8b873..e384cd53d 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/OnMissingPropertyCondition.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/OnMissingPropertyCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java index 411ef5fda..b84482a7e 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java index b5ca34a79..6deddb5c2 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheProperties.java index 4c3cb1eda..862f949a8 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheServerProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheServerProperties.java index 8152a2e7c..529aae726 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheServerProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheServerProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientCacheProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientCacheProperties.java index 3734b7868..58f643c93 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientCacheProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientCacheProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientSecurityProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientSecurityProperties.java index 53f8dd5ac..8a54c4fc4 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientSecurityProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientSecurityProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClusterProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClusterProperties.java index a3678f553..7c6f7df9e 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClusterProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClusterProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/DiskStoreProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/DiskStoreProperties.java index c645d7db4..ec08aa360 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/DiskStoreProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/DiskStoreProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/EntityProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/EntityProperties.java index e66652e3e..fc89761b1 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/EntityProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/EntityProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LocatorProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LocatorProperties.java index 50216694b..4fa389032 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LocatorProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LocatorProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LoggingProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LoggingProperties.java index 4eb2a19ad..d8a3267d8 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LoggingProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LoggingProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagementProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagementProperties.java index ce5e107dd..c6640b365 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagementProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagementProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagerProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagerProperties.java index 70795376c..855c792e4 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagerProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagerProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PdxProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PdxProperties.java index f68c02249..ba2aa850d 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PdxProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PdxProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerCacheProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerCacheProperties.java index eda422238..85c457734 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerCacheProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerCacheProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerSecurityProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerSecurityProperties.java index e454908df..9901c9703 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerSecurityProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerSecurityProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PoolProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PoolProperties.java index 7b1689e8c..f743fe406 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PoolProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PoolProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SecurityProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SecurityProperties.java index 4ffcba194..e7697c58e 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SecurityProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SecurityProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ServiceProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ServiceProperties.java index 6d48d2029..23915f0dc 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ServiceProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ServiceProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SslProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SslProperties.java index d1b1fbcb5..bb7cd4610 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SslProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SslProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java index 7392792e7..fcb310889 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfiguration.java index a4b3d6150..95884a7ea 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/HttpBasicAuthenticationSecurityConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/HttpBasicAuthenticationSecurityConfiguration.java index b5dc1d7ec..6e9211e0a 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/HttpBasicAuthenticationSecurityConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/HttpBasicAuthenticationSecurityConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java index 2e9ca27e2..3121b01ce 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/app/books/NonBeanType.java b/spring-geode-autoconfigure/src/test/java/example/app/books/NonBeanType.java index 9b55c5add..1f975f47c 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/books/NonBeanType.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/books/NonBeanType.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/app/books/model/Author.java b/spring-geode-autoconfigure/src/test/java/example/app/books/model/Author.java index a61ccb8fa..c258fbd1c 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/books/model/Author.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/books/model/Author.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/app/books/model/Book.java b/spring-geode-autoconfigure/src/test/java/example/app/books/model/Book.java index be4bcee69..073f8f73c 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/books/model/Book.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/books/model/Book.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/app/books/model/ISBN.java b/spring-geode-autoconfigure/src/test/java/example/app/books/model/ISBN.java index 4e5e76d9c..fe33aabb9 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/books/model/ISBN.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/books/model/ISBN.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/app/books/repo/BookRepository.java b/spring-geode-autoconfigure/src/test/java/example/app/books/repo/BookRepository.java index 5b052151d..db891f33e 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/books/repo/BookRepository.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/books/repo/BookRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/app/books/service/BookService.java b/spring-geode-autoconfigure/src/test/java/example/app/books/service/BookService.java index 771571459..24013527d 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/books/service/BookService.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/books/service/BookService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/app/books/service/support/CachingBookService.java b/spring-geode-autoconfigure/src/test/java/example/app/books/service/support/CachingBookService.java index 7dbaa174a..a818ebe2e 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/books/service/support/CachingBookService.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/books/service/support/CachingBookService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/app/golf/model/Golfer.java b/spring-geode-autoconfigure/src/test/java/example/app/golf/model/Golfer.java index 6b8af52f8..930af7971 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/golf/model/Golfer.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/golf/model/Golfer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/app/library/service/LibraryService.java b/spring-geode-autoconfigure/src/test/java/example/app/library/service/LibraryService.java index 7b1a88ea7..f17fba6e1 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/library/service/LibraryService.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/library/service/LibraryService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/echo/config/EchoClientConfiguration.java b/spring-geode-autoconfigure/src/test/java/example/echo/config/EchoClientConfiguration.java index 81d9f8491..213bd3173 100644 --- a/spring-geode-autoconfigure/src/test/java/example/echo/config/EchoClientConfiguration.java +++ b/spring-geode-autoconfigure/src/test/java/example/echo/config/EchoClientConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/echo/config/EchoServerConfiguration.java b/spring-geode-autoconfigure/src/test/java/example/echo/config/EchoServerConfiguration.java index 60fb40baf..0ccb4aeb9 100644 --- a/spring-geode-autoconfigure/src/test/java/example/echo/config/EchoServerConfiguration.java +++ b/spring-geode-autoconfigure/src/test/java/example/echo/config/EchoServerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/geode/cache/EchoCacheLoader.java b/spring-geode-autoconfigure/src/test/java/example/geode/cache/EchoCacheLoader.java index a3baa8607..0d66ffd7c 100644 --- a/spring-geode-autoconfigure/src/test/java/example/geode/cache/EchoCacheLoader.java +++ b/spring-geode-autoconfigure/src/test/java/example/geode/cache/EchoCacheLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReading.java b/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReading.java index 29604fa7e..f0e2ea1d3 100644 --- a/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReading.java +++ b/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReading.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java b/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java index 33edfa6ed..b2615005b 100644 --- a/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java +++ b/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureUnit.java b/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureUnit.java index c3cb0ae53..bc7875d89 100644 --- a/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureUnit.java +++ b/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureUnit.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/java/lang/IntValueComparisonUnitTests.java b/spring-geode-autoconfigure/src/test/java/example/java/lang/IntValueComparisonUnitTests.java index 2ce111b4d..637a453e6 100644 --- a/spring-geode-autoconfigure/src/test/java/example/java/lang/IntValueComparisonUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/example/java/lang/IntValueComparisonUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/java/lang/ObjectSerializationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/example/java/lang/ObjectSerializationIntegrationTests.java index e37300a4e..c1846decb 100644 --- a/spring-geode-autoconfigure/src/test/java/example/java/lang/ObjectSerializationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/example/java/lang/ObjectSerializationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/java/lang/ObjectToStringWithOptionalUnitTests.java b/spring-geode-autoconfigure/src/test/java/example/java/lang/ObjectToStringWithOptionalUnitTests.java index c657d701d..6cfe1a21d 100644 --- a/spring-geode-autoconfigure/src/test/java/example/java/lang/ObjectToStringWithOptionalUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/example/java/lang/ObjectToStringWithOptionalUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/java/net/UrlRevealed.java b/spring-geode-autoconfigure/src/test/java/example/java/net/UrlRevealed.java index b21411510..2db3530e4 100644 --- a/spring-geode-autoconfigure/src/test/java/example/java/net/UrlRevealed.java +++ b/spring-geode-autoconfigure/src/test/java/example/java/net/UrlRevealed.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/example/test/service/TestCacheableService.java b/spring-geode-autoconfigure/src/test/java/example/test/service/TestCacheableService.java index 84342da64..ad8f53bf0 100644 --- a/spring-geode-autoconfigure/src/test/java/example/test/service/TestCacheableService.java +++ b/spring-geode-autoconfigure/src/test/java/example/test/service/TestCacheableService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ComplexConditionalConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ComplexConditionalConfigurationIntegrationTests.java index d7d54f36d..afec42fff 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ComplexConditionalConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ComplexConditionalConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/CacheNameAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/CacheNameAutoConfigurationIntegrationTests.java index 4dfc56828..de9beeb4a 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/CacheNameAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/CacheNameAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/ClientCachePoolCustomizationsIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/ClientCachePoolCustomizationsIntegrationTests.java index 67ee4d713..d01bdf515 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/ClientCachePoolCustomizationsIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/ClientCachePoolCustomizationsIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java index 534c77d2f..2b223b86f 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java index eb7a79602..8e2363a4c 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java index 343363bd6..7dcaba551 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingUnitTests.java index d504a6b4c..2b18b59fc 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java index df709f682..64cbed609 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredWithPropertiesCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredWithPropertiesCachingIntegrationTests.java index 52d32aff9..6fc08b25b 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredWithPropertiesCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredWithPropertiesCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/aware/SecureClusterAwareConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/aware/SecureClusterAwareConfigurationIntegrationTests.java index a8e13e209..0b345abbf 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/aware/SecureClusterAwareConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/aware/SecureClusterAwareConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithAuthenticationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithAuthenticationIntegrationTests.java index 8f7812344..c5634a893 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithAuthenticationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithAuthenticationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java index 563cd3593..ec82c9831 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java index 5e973da39..568b48cdc 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/condition/ConditionalOnMissingPropertyIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/condition/ConditionalOnMissingPropertyIntegrationTests.java index d3d3275f4..95f998457 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/condition/ConditionalOnMissingPropertyIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/condition/ConditionalOnMissingPropertyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentApplyToPeerCacheApplicationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentApplyToPeerCacheApplicationIntegrationTests.java index f0482bbb4..0cd642141 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentApplyToPeerCacheApplicationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentApplyToPeerCacheApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationIntegrationTests.java index 15bb1a450..01dea9724 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationUnitTests.java index b709eedec..ba03581c8 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java index 44babcf3c..d3077a10a 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java index 39b68eec7..91ed7b53f 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java index f0000c520..4a8c7ef11 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java index 6d69d103a..0ef7bd487 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/CacheDataExportAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/CacheDataExportAutoConfigurationIntegrationTests.java index 899f7aacd..3236af211 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/CacheDataExportAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/CacheDataExportAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/ClientCacheDataImportExportAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/ClientCacheDataImportExportAutoConfigurationIntegrationTests.java index c7b6b55b4..cf4af0ed8 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/ClientCacheDataImportExportAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/ClientCacheDataImportExportAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/LocalClientCacheDataImportAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/LocalClientCacheDataImportAutoConfigurationIntegrationTests.java index bc58d8c59..b4aead31e 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/LocalClientCacheDataImportAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/LocalClientCacheDataImportAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/RestServiceCacheDataImportExportIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/RestServiceCacheDataImportExportIntegrationTests.java index ef8cedeec..9c6b72d20 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/RestServiceCacheDataImportExportIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/RestServiceCacheDataImportExportIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java index fefdd8967..945148161 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java index 200f4b296..f9ddb27d6 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/locator/SpringBootLocatorApplicationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/locator/SpringBootLocatorApplicationIntegrationTests.java index 68d66551e..79969a981 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/locator/SpringBootLocatorApplicationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/locator/SpringBootLocatorApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java index 9524b6039..fd99fd414 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingManualConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingManualConfigurationIntegrationTests.java index 00917f938..c83311790 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingManualConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingManualConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/ManuallyConfiguredPdxSerializerWithPdxSerializationAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/ManuallyConfiguredPdxSerializerWithPdxSerializationAutoConfigurationIntegrationTests.java index e6eebe9d8..ca6af4e34 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/ManuallyConfiguredPdxSerializerWithPdxSerializationAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/ManuallyConfiguredPdxSerializerWithPdxSerializationAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/MappingPdxSerializerPdxSerializationAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/MappingPdxSerializerPdxSerializationAutoConfigurationIntegrationTests.java index 4e8c3e695..eaaabfeea 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/MappingPdxSerializerPdxSerializationAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/MappingPdxSerializerPdxSerializationAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperRegionAspectUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperRegionAspectUnitTests.java index 097d8337c..be7763175 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperRegionAspectUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperRegionAspectUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/UserDefinedPdxSerializerPdxSerializationAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/UserDefinedPdxSerializerPdxSerializationAutoConfigurationIntegrationTests.java index 4d4476f53..33d3ff263 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/UserDefinedPdxSerializerPdxSerializationAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/UserDefinedPdxSerializerPdxSerializationAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java index d952b61d0..f43ebfe36 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java index eacf6b4d2..0d86bf0bf 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java index 0d1065055..19e9882ae 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java index a76b25387..ae0e10063 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java index 5e27f42c2..11c71032d 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/ClientSecurityAutoConfigurationUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/ClientSecurityAutoConfigurationUnitTests.java index b8942fff3..94e10da69 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/ClientSecurityAutoConfigurationUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/ClientSecurityAutoConfigurationUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java index 092910051..78561076f 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/http/HttpBasicAuthenticationSecurityConfigurationUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/http/HttpBasicAuthenticationSecurityConfigurationUnitTests.java index 2e606050b..0c01b23e0 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/http/HttpBasicAuthenticationSecurityConfigurationUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/http/HttpBasicAuthenticationSecurityConfigurationUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java index 50d38bb75..0decce004 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java index d26885e43..a4ce6bcad 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/multi/AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/multi/AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrationTests.java index 7a84e1f4a..b40d9e5f3 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/multi/AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/multi/AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java index c429d9325..335633ac0 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/SslAutoConfigurationUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/SslAutoConfigurationUnitTests.java index 365906425..f7c669732 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/SslAutoConfigurationUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/SslAutoConfigurationUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/AbstractTlsEnabledAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/AbstractTlsEnabledAutoConfigurationIntegrationTests.java index 3b1e5838b..384cd5795 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/AbstractTlsEnabledAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/AbstractTlsEnabledAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/MockedTlsEnabledAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/MockedTlsEnabledAutoConfigurationIntegrationTests.java index 0ceaa1259..667318e31 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/MockedTlsEnabledAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/MockedTlsEnabledAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/TlsEnabledAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/TlsEnabledAutoConfigurationIntegrationTests.java index 1e3547433..4efbfd441 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/TlsEnabledAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/TlsEnabledAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java index 993a1d111..bd35e9c4d 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingUsingRepositoryWithMocksIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingUsingRepositoryWithMocksIntegrationTests.java index 5198ededa..2640f0b78 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingUsingRepositoryWithMocksIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingUsingRepositoryWithMocksIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionLocalCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionLocalCachingIntegrationTests.java index 28d78637d..19ba16499 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionLocalCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionLocalCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java index 77ba69b03..3660fad37 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java index 4d8bd8267..f7817edda 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java index 52daab55a..6cb830732 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java index 51f67cf0c..b964ffe80 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java index 62a15966b..b7e74ebe9 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java index d18bec200..df95020c2 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/suite/SslToNonSslTestSuite.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/suite/SslToNonSslTestSuite.java index f5030e493..c9c6a4e9f 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/suite/SslToNonSslTestSuite.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/suite/SslToNonSslTestSuite.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfigurationUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfigurationUnitTests.java index 678e11b8a..81b09b4f9 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfigurationUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfigurationUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java index b1902894d..9d023083d 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredNonInjectedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredNonInjectedRegionTemplateAutoConfigurationIntegrationTests.java index c48b0fe45..429c175d4 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredNonInjectedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredNonInjectedRegionTemplateAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java index 66fe4b764..92d747be1 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java index a000683e4..f0bea3755 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java index f1258b210..922b7821e 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java index c71cbb553..2fdfd50d9 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java index c3c8357eb..0d69770ad 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ServerDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ServerDefinedRegionTemplateAutoConfigurationIntegrationTests.java index 45a50137e..2390be687 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ServerDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ServerDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/topology/clientserver/SpringBootApacheGeodeClientServerIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/topology/clientserver/SpringBootApacheGeodeClientServerIntegrationTests.java index ccb0d003f..9addd91b9 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/topology/clientserver/SpringBootApacheGeodeClientServerIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/topology/clientserver/SpringBootApacheGeodeClientServerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/Guards.java b/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/Guards.java index 8456887ca..a9a9b0986 100644 --- a/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/Guards.java +++ b/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/Guards.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/MapMapper.java b/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/MapMapper.java index 577f107a0..327a3c33e 100644 --- a/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/MapMapper.java +++ b/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/MapMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/boot/GeodeBindingsPropertiesProcessor.java b/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/boot/GeodeBindingsPropertiesProcessor.java index 89127828b..c64383f92 100644 --- a/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/boot/GeodeBindingsPropertiesProcessor.java +++ b/spring-geode-cloud/src/main/java/org/springframework/geode/cloud/bindings/boot/GeodeBindingsPropertiesProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-cloud/src/test/java/org/springframework/geode/cloud/bindings/boot/GeodeBindingsPropertiesProcessorUnitTests.java b/spring-geode-cloud/src/test/java/org/springframework/geode/cloud/bindings/boot/GeodeBindingsPropertiesProcessorUnitTests.java index f02a930ca..310aad9a1 100644 --- a/spring-geode-cloud/src/test/java/org/springframework/geode/cloud/bindings/boot/GeodeBindingsPropertiesProcessorUnitTests.java +++ b/spring-geode-cloud/src/test/java/org/springframework/geode/cloud/bindings/boot/GeodeBindingsPropertiesProcessorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/client/SpringBootApacheGeodeClientCacheApplication.java b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/client/SpringBootApacheGeodeClientCacheApplication.java index 13fd0d1af..eee9b19d0 100644 --- a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/client/SpringBootApacheGeodeClientCacheApplication.java +++ b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/client/SpringBootApacheGeodeClientCacheApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/SpringBootApacheGeodeDockerClientCacheApplication.java b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/SpringBootApacheGeodeDockerClientCacheApplication.java index 7c3ecd250..ece9bd0b6 100644 --- a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/SpringBootApacheGeodeDockerClientCacheApplication.java +++ b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/SpringBootApacheGeodeDockerClientCacheApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/model/Customer.java b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/model/Customer.java index ac8b4f104..363dbf80e 100644 --- a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/model/Customer.java +++ b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/model/Customer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/repo/CustomerRepository.java b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/repo/CustomerRepository.java index 6c6ed2080..fc549cedf 100644 --- a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/repo/CustomerRepository.java +++ b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/docker/repo/CustomerRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/locator/SpringBootApacheGeodeLocatorApplication.java b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/locator/SpringBootApacheGeodeLocatorApplication.java index a15817542..3e804f77b 100644 --- a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/locator/SpringBootApacheGeodeLocatorApplication.java +++ b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/locator/SpringBootApacheGeodeLocatorApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/server/SpringBootApacheGeodeCacheServerApplication.java b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/server/SpringBootApacheGeodeCacheServerApplication.java index aa2cdb254..1a2a42665 100644 --- a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/server/SpringBootApacheGeodeCacheServerApplication.java +++ b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/server/SpringBootApacheGeodeCacheServerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-docs/src/test/java/example/test/integration/SpringBootApacheGeodeIntegrationTest.java b/spring-geode-docs/src/test/java/example/test/integration/SpringBootApacheGeodeIntegrationTest.java index 71888d45c..8f03bca99 100644 --- a/spring-geode-docs/src/test/java/example/test/integration/SpringBootApacheGeodeIntegrationTest.java +++ b/spring-geode-docs/src/test/java/example/test/integration/SpringBootApacheGeodeIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-docs/src/test/java/example/test/unit/SpringBootApacheGeodeUnitTest.java b/spring-geode-docs/src/test/java/example/test/unit/SpringBootApacheGeodeUnitTest.java index 9848ff609..7532dd10b 100644 --- a/spring-geode-docs/src/test/java/example/test/unit/SpringBootApacheGeodeUnitTest.java +++ b/spring-geode-docs/src/test/java/example/test/unit/SpringBootApacheGeodeUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/BoilingTemperatureEvent.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/BoilingTemperatureEvent.java index 474af800c..62f92a1d9 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/BoilingTemperatureEvent.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/BoilingTemperatureEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/FreezingTemperatureEvent.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/FreezingTemperatureEvent.java index ee24f4be1..24c10fa41 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/FreezingTemperatureEvent.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/FreezingTemperatureEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java index 337a26f30..ac4d76f3d 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java index d9785553c..2e22af77a 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java index 2c08a46af..617b11d2c 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java index c390c9df7..ad864c388 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java index 5948f388b..4515254f3 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java index 28f02d8a4..7f83f57e2 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java index 530a67752..df4e4a6cb 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/CustomerServiceApplication.java b/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/CustomerServiceApplication.java index 77da8045d..bcc6665c2 100644 --- a/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/CustomerServiceApplication.java +++ b/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/CustomerServiceApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/model/Customer.java b/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/model/Customer.java index 1fee78fdc..183acc68b 100644 --- a/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/model/Customer.java +++ b/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/model/Customer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/repo/CustomerRepository.java b/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/repo/CustomerRepository.java index 7a9f65d42..bef519634 100644 --- a/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/repo/CustomerRepository.java +++ b/spring-geode-samples/boot/configuration/src/main/java/example/app/crm/repo/CustomerRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/CustomerServiceApplicationIntegrationTests.java b/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/CustomerServiceApplicationIntegrationTests.java index e67633916..07792473f 100644 --- a/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/CustomerServiceApplicationIntegrationTests.java +++ b/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/CustomerServiceApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/support/GemFireDebugConfiguration.java b/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/support/GemFireDebugConfiguration.java index 4113faf72..6edad8867 100644 --- a/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/support/GemFireDebugConfiguration.java +++ b/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/support/GemFireDebugConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/security/src/main/java/example/app/security/client/BootGeodeSecurityClientApplication.java b/spring-geode-samples/boot/security/src/main/java/example/app/security/client/BootGeodeSecurityClientApplication.java index 9e23c4b5c..022408c46 100644 --- a/spring-geode-samples/boot/security/src/main/java/example/app/security/client/BootGeodeSecurityClientApplication.java +++ b/spring-geode-samples/boot/security/src/main/java/example/app/security/client/BootGeodeSecurityClientApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/security/src/main/java/example/app/security/client/controller/SecurityController.java b/spring-geode-samples/boot/security/src/main/java/example/app/security/client/controller/SecurityController.java index f6ad2d6e2..e23df6c6e 100644 --- a/spring-geode-samples/boot/security/src/main/java/example/app/security/client/controller/SecurityController.java +++ b/spring-geode-samples/boot/security/src/main/java/example/app/security/client/controller/SecurityController.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/security/src/main/java/example/app/security/client/model/Customer.java b/spring-geode-samples/boot/security/src/main/java/example/app/security/client/model/Customer.java index afef5ced4..ace8b8690 100644 --- a/spring-geode-samples/boot/security/src/main/java/example/app/security/client/model/Customer.java +++ b/spring-geode-samples/boot/security/src/main/java/example/app/security/client/model/Customer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/security/src/main/java/example/app/security/server/BootGeodeSecurityServerApplication.java b/spring-geode-samples/boot/security/src/main/java/example/app/security/server/BootGeodeSecurityServerApplication.java index f0b6d675a..13465a0df 100644 --- a/spring-geode-samples/boot/security/src/main/java/example/app/security/server/BootGeodeSecurityServerApplication.java +++ b/spring-geode-samples/boot/security/src/main/java/example/app/security/server/BootGeodeSecurityServerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/boot/security/src/test/java/example/app/security/tests/BootGeodeSecurityClientApplicationIntegrationTests.java b/spring-geode-samples/boot/security/src/test/java/example/app/security/tests/BootGeodeSecurityClientApplicationIntegrationTests.java index 24ca6f725..01ba81cea 100644 --- a/spring-geode-samples/boot/security/src/test/java/example/app/security/tests/BootGeodeSecurityClientApplicationIntegrationTests.java +++ b/spring-geode-samples/boot/security/src/test/java/example/app/security/tests/BootGeodeSecurityClientApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplication.java b/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplication.java index f666fcd0e..1cb30eca9 100644 --- a/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplication.java +++ b/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/controller/CounterController.java b/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/controller/CounterController.java index 2873c5ba4..97c339965 100644 --- a/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/controller/CounterController.java +++ b/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/controller/CounterController.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/http-session/src/test/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplicationIntegrationTests.java b/spring-geode-samples/caching/http-session/src/test/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplicationIntegrationTests.java index 449204fe4..48be40286 100644 --- a/spring-geode-samples/caching/http-session/src/test/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplicationIntegrationTests.java +++ b/spring-geode-samples/caching/http-session/src/test/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/BootGeodeAsyncInlineCachingClientApplication.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/BootGeodeAsyncInlineCachingClientApplication.java index a3fb5fd4f..114465941 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/BootGeodeAsyncInlineCachingClientApplication.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/BootGeodeAsyncInlineCachingClientApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/GolfCourse.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/GolfCourse.java index 53b98c8ad..616a8f7c3 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/GolfCourse.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/GolfCourse.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/GolfTournament.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/GolfTournament.java index 65a01efd7..49cea6b8e 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/GolfTournament.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/GolfTournament.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java index 7af7aa029..d23442ea3 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/support/GolfCourseBuilder.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/support/GolfCourseBuilder.java index 2949bef0c..f942decbb 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/support/GolfCourseBuilder.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/support/GolfCourseBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/support/GolferBuilder.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/support/GolferBuilder.java index 8b21016c9..eed614be1 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/support/GolferBuilder.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/support/GolferBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/repo/GolferRepository.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/repo/GolferRepository.java index 1f4bb3c47..e594b0bab 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/repo/GolferRepository.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/repo/GolferRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/GolferService.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/GolferService.java index 0b6aca678..9c2b9bc70 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/GolferService.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/GolferService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/PgaTourService.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/PgaTourService.java index 8afe4a6d6..9c7780a83 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/PgaTourService.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/PgaTourService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/web/GolferController.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/web/GolferController.java index 9192b6c79..bd097d3dc 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/web/GolferController.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/web/GolferController.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingConfiguration.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingConfiguration.java index 33951fc78..62ac66d5f 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingConfiguration.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingRegionConfiguration.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingRegionConfiguration.java index 9cba85b68..7439e2821 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingRegionConfiguration.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingRegionConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/server/BootGeodeAsyncInlineCachingServerApplication.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/server/BootGeodeAsyncInlineCachingServerApplication.java index e50836274..7b8385315 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/server/BootGeodeAsyncInlineCachingServerApplication.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/server/BootGeodeAsyncInlineCachingServerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_size/AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java b/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_size/AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java index b0280f77e..223445a58 100644 --- a/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_size/AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java +++ b/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_size/AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_time_interval/AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java b/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_time_interval/AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java index cb8ae2d94..62e32cffc 100644 --- a/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_time_interval/AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java +++ b/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_time_interval/AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/BootGeodeInlineCachingApplication.java b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/BootGeodeInlineCachingApplication.java index 087933cc1..d7088f179 100644 --- a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/BootGeodeInlineCachingApplication.java +++ b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/BootGeodeInlineCachingApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/config/CalculatorConfiguration.java b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/config/CalculatorConfiguration.java index ae34231e5..6d63c488f 100644 --- a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/config/CalculatorConfiguration.java +++ b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/config/CalculatorConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/controller/CalculatorController.java b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/controller/CalculatorController.java index fd366b0a0..c4cbe8bf4 100644 --- a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/controller/CalculatorController.java +++ b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/controller/CalculatorController.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/Operator.java b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/Operator.java index 318010224..86e76bf1c 100644 --- a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/Operator.java +++ b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/Operator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/ResultHolder.java b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/ResultHolder.java index adef29130..666712af0 100644 --- a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/ResultHolder.java +++ b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/ResultHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/repo/CalculatorRepository.java b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/repo/CalculatorRepository.java index bed72a063..66ce0d24e 100644 --- a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/repo/CalculatorRepository.java +++ b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/repo/CalculatorRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/service/CalculatorService.java b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/service/CalculatorService.java index 25551e1a3..e0823fd34 100644 --- a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/service/CalculatorService.java +++ b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/service/CalculatorService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/service/support/AbstractCacheableService.java b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/service/support/AbstractCacheableService.java index 4bdbe5497..0630acbcc 100644 --- a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/service/support/AbstractCacheableService.java +++ b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/service/support/AbstractCacheableService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/inline/src/test/java/example/app/caching/inline/CalculatorApplicationIntegrationTests.java b/spring-geode-samples/caching/inline/src/test/java/example/app/caching/inline/CalculatorApplicationIntegrationTests.java index b22c21f8a..d30a6193d 100644 --- a/spring-geode-samples/caching/inline/src/test/java/example/app/caching/inline/CalculatorApplicationIntegrationTests.java +++ b/spring-geode-samples/caching/inline/src/test/java/example/app/caching/inline/CalculatorApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplication.java b/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplication.java index 022c4a5fd..1b211bd49 100644 --- a/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplication.java +++ b/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/config/GeodeConfiguration.java b/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/config/GeodeConfiguration.java index 7a93bd599..64fa4f2bc 100644 --- a/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/config/GeodeConfiguration.java +++ b/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/config/GeodeConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/controller/CounterController.java b/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/controller/CounterController.java index 0bd96a29b..321931947 100644 --- a/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/controller/CounterController.java +++ b/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/controller/CounterController.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/service/CounterService.java b/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/service/CounterService.java index e771655d7..58e4d12c9 100644 --- a/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/service/CounterService.java +++ b/spring-geode-samples/caching/look-aside/src/main/java/example/app/caching/lookaside/service/CounterService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/look-aside/src/test/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplicationIntegrationTests.java b/spring-geode-samples/caching/look-aside/src/test/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplicationIntegrationTests.java index 22dd683a3..9a1d14216 100644 --- a/spring-geode-samples/caching/look-aside/src/test/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplicationIntegrationTests.java +++ b/spring-geode-samples/caching/look-aside/src/test/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/BootGeodeMultiSiteCachingClientApplication.java b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/BootGeodeMultiSiteCachingClientApplication.java index 8d8d0848d..4b40b5cb8 100644 --- a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/BootGeodeMultiSiteCachingClientApplication.java +++ b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/BootGeodeMultiSiteCachingClientApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/model/Customer.java b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/model/Customer.java index 2c0d20408..4023ede71 100644 --- a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/model/Customer.java +++ b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/model/Customer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/service/CustomerService.java b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/service/CustomerService.java index 7649dcd1a..4ff679e02 100644 --- a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/service/CustomerService.java +++ b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/service/CustomerService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/util/ThreadUtils.java b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/util/ThreadUtils.java index 2ca6501d1..0628033a2 100644 --- a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/util/ThreadUtils.java +++ b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/util/ThreadUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/web/CustomerController.java b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/web/CustomerController.java index 0fa3d3fc4..d8261b4a8 100644 --- a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/web/CustomerController.java +++ b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/client/web/CustomerController.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/server/BootGeodeMultiSiteCachingServerApplication.java b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/server/BootGeodeMultiSiteCachingServerApplication.java index 1e6814279..85d8be97e 100644 --- a/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/server/BootGeodeMultiSiteCachingServerApplication.java +++ b/spring-geode-samples/caching/multi-site/src/main/java/example/app/caching/multisite/server/BootGeodeMultiSiteCachingServerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/multi-site/src/test/java/example/app/caching/multisite/MultiSiteCachingIntegrationTests.java b/spring-geode-samples/caching/multi-site/src/test/java/example/app/caching/multisite/MultiSiteCachingIntegrationTests.java index dc4c9c7f3..1d376685a 100644 --- a/spring-geode-samples/caching/multi-site/src/test/java/example/app/caching/multisite/MultiSiteCachingIntegrationTests.java +++ b/spring-geode-samples/caching/multi-site/src/test/java/example/app/caching/multisite/MultiSiteCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplication.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplication.java index 7e391dbb8..e8d5250a9 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplication.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/config/GeodeConfiguration.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/config/GeodeConfiguration.java index 5a9d7482a..8b89d6a1a 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/config/GeodeConfiguration.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/config/GeodeConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/controller/YellowPagesController.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/controller/YellowPagesController.java index fd95fd31a..ea63c79e1 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/controller/YellowPagesController.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/controller/YellowPagesController.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/model/Person.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/model/Person.java index 44ff12665..821f61339 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/model/Person.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/model/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/YellowPagesService.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/YellowPagesService.java index b236c640d..2c5a0aafe 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/YellowPagesService.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/YellowPagesService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/AbstractCacheableService.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/AbstractCacheableService.java index b66f61bc7..6bd2780b6 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/AbstractCacheableService.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/AbstractCacheableService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/EmailGenerator.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/EmailGenerator.java index f477cced2..0a036b1ff 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/EmailGenerator.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/EmailGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java index 30bea5031..a993df987 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/server/BootGeodeNearCachingCacheServerApplication.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/server/BootGeodeNearCachingCacheServerApplication.java index a355875fc..00df5fd99 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/server/BootGeodeNearCachingCacheServerApplication.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/server/BootGeodeNearCachingCacheServerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/caching/near/src/test/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java b/spring-geode-samples/caching/near/src/test/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java index 2f7d711e2..d3d5ee4a8 100644 --- a/spring-geode-samples/caching/near/src/test/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java +++ b/spring-geode-samples/caching/near/src/test/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/CrmApplication.java b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/CrmApplication.java index ab9d48f08..2af98da6d 100644 --- a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/CrmApplication.java +++ b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/CrmApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/config/CustomerConfiguration.java b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/config/CustomerConfiguration.java index 42fbe34db..d0d21f4d0 100644 --- a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/config/CustomerConfiguration.java +++ b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/config/CustomerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/controller/CustomerController.java b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/controller/CustomerController.java index f9c137007..5d3ff2efa 100644 --- a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/controller/CustomerController.java +++ b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/controller/CustomerController.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/model/Customer.java b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/model/Customer.java index a11c743e9..0b629f60f 100644 --- a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/model/Customer.java +++ b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/model/Customer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/repo/CustomerRepository.java b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/repo/CustomerRepository.java index fd1efcc5d..eeca72be4 100644 --- a/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/repo/CustomerRepository.java +++ b/spring-geode-samples/intro/getting-started/src/main/java/example/app/crm/repo/CustomerRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/intro/getting-started/src/test/java/example/app/crm/CrmApplicationIntegrationTests.java b/spring-geode-samples/intro/getting-started/src/test/java/example/app/crm/CrmApplicationIntegrationTests.java index 3548d1eff..a2b9c1536 100644 --- a/spring-geode-samples/intro/getting-started/src/test/java/example/app/crm/CrmApplicationIntegrationTests.java +++ b/spring-geode-samples/intro/getting-started/src/test/java/example/app/crm/CrmApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/intro/quick-start/src/main/java/example/app/user/UserApplication.java b/spring-geode-samples/intro/quick-start/src/main/java/example/app/user/UserApplication.java index 46eb18fa1..fd9d12a6a 100644 --- a/spring-geode-samples/intro/quick-start/src/main/java/example/app/user/UserApplication.java +++ b/spring-geode-samples/intro/quick-start/src/main/java/example/app/user/UserApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-samples/intro/quick-start/src/test/java/example/app/user/UserApplicationIntegrationTests.java b/spring-geode-samples/intro/quick-start/src/test/java/example/app/user/UserApplicationIntegrationTests.java index 5306df952..a68e8e734 100644 --- a/spring-geode-samples/intro/quick-start/src/test/java/example/app/user/UserApplicationIntegrationTests.java +++ b/spring-geode-samples/intro/quick-start/src/test/java/example/app/user/UserApplicationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/CompositeAppender.java b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/CompositeAppender.java index 2abcc260d..926816b7e 100644 --- a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/CompositeAppender.java +++ b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/CompositeAppender.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppender.java b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppender.java index 39215c9e5..072492fd3 100644 --- a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppender.java +++ b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppender.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/StringAppender.java b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/StringAppender.java index beded115a..76396f54d 100644 --- a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/StringAppender.java +++ b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/StringAppender.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/support/LogbackSupport.java b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/support/LogbackSupport.java index 1e7939e18..4078bff1e 100644 --- a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/support/LogbackSupport.java +++ b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/support/LogbackSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java index 58c9a16ba..710da3dac 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/CompositeAppenderUnitTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/CompositeAppenderUnitTests.java index 62f5ee9b3..a1012ef37 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/CompositeAppenderUnitTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/CompositeAppenderUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DebugLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DebugLoggingIntegrationTests.java index 93aa6ae8b..1713c22cc 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DebugLoggingIntegrationTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DebugLoggingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppenderUnitTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppenderUnitTests.java index 061a374bd..080eded56 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppenderUnitTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppenderUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/InfoLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/InfoLoggingIntegrationTests.java index b22cc2a71..72633039d 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/InfoLoggingIntegrationTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/InfoLoggingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/NoLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/NoLoggingIntegrationTests.java index 9348caa53..9e3e7e666 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/NoLoggingIntegrationTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/NoLoggingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/StringAppenderUnitTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/StringAppenderUnitTests.java index 858f7ad5e..68d9a4486 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/StringAppenderUnitTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/StringAppenderUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/function/PetServiceFunctionExecutions.java b/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/function/PetServiceFunctionExecutions.java index cf73450b1..1ea74adca 100644 --- a/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/function/PetServiceFunctionExecutions.java +++ b/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/function/PetServiceFunctionExecutions.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/model/Pet.java b/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/model/Pet.java index 64f243d40..922028dc7 100644 --- a/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/model/Pet.java +++ b/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/model/Pet.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/repo/PetRepository.java b/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/repo/PetRepository.java index 1eaff0d98..83c9ecf1b 100644 --- a/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/repo/PetRepository.java +++ b/spring-geode-tests/smoke-tests/function-execution-on-region/src/main/java/example/app/petclinic/repo/PetRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/function-execution-on-region/src/test/java/example/app/petclinic/PetClinicApplicationSmokeTests.java b/spring-geode-tests/smoke-tests/function-execution-on-region/src/test/java/example/app/petclinic/PetClinicApplicationSmokeTests.java index 87fb91bde..3b2e857d1 100644 --- a/spring-geode-tests/smoke-tests/function-execution-on-region/src/test/java/example/app/petclinic/PetClinicApplicationSmokeTests.java +++ b/spring-geode-tests/smoke-tests/function-execution-on-region/src/test/java/example/app/petclinic/PetClinicApplicationSmokeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/locator-application/src/main/java/example/app/geode/locator/ApacheGeodeLocatorApplication.java b/spring-geode-tests/smoke-tests/locator-application/src/main/java/example/app/geode/locator/ApacheGeodeLocatorApplication.java index 8fcdad464..6931f870e 100644 --- a/spring-geode-tests/smoke-tests/locator-application/src/main/java/example/app/geode/locator/ApacheGeodeLocatorApplication.java +++ b/spring-geode-tests/smoke-tests/locator-application/src/main/java/example/app/geode/locator/ApacheGeodeLocatorApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/locator-application/src/main/java/example/app/geode/locator/SpringBootApacheGeodeLocatorApplication.java b/spring-geode-tests/smoke-tests/locator-application/src/main/java/example/app/geode/locator/SpringBootApacheGeodeLocatorApplication.java index 5cfb7bdd2..e1c9e5a2b 100644 --- a/spring-geode-tests/smoke-tests/locator-application/src/main/java/example/app/geode/locator/SpringBootApacheGeodeLocatorApplication.java +++ b/spring-geode-tests/smoke-tests/locator-application/src/main/java/example/app/geode/locator/SpringBootApacheGeodeLocatorApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/locator-application/src/test/java/example/app/geode/locator/SpringBootApacheGeodeLocatorApplicationSmokeTests.java b/spring-geode-tests/smoke-tests/locator-application/src/test/java/example/app/geode/locator/SpringBootApacheGeodeLocatorApplicationSmokeTests.java index 864e419f3..8dfce82ad 100644 --- a/spring-geode-tests/smoke-tests/locator-application/src/test/java/example/app/geode/locator/SpringBootApacheGeodeLocatorApplicationSmokeTests.java +++ b/spring-geode-tests/smoke-tests/locator-application/src/test/java/example/app/geode/locator/SpringBootApacheGeodeLocatorApplicationSmokeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/logging/src/main/java/example/app/geode/logging/ApacheGeodeLoggingApplication.java b/spring-geode-tests/smoke-tests/logging/src/main/java/example/app/geode/logging/ApacheGeodeLoggingApplication.java index 711d9f077..c0dd5f2ab 100644 --- a/spring-geode-tests/smoke-tests/logging/src/main/java/example/app/geode/logging/ApacheGeodeLoggingApplication.java +++ b/spring-geode-tests/smoke-tests/logging/src/main/java/example/app/geode/logging/ApacheGeodeLoggingApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/logging/src/test/java/example/app/geode/logging/ApacheGeodeLoggingApplicationSmokeTests.java b/spring-geode-tests/smoke-tests/logging/src/test/java/example/app/geode/logging/ApacheGeodeLoggingApplicationSmokeTests.java index 81e31280c..1504503c0 100644 --- a/spring-geode-tests/smoke-tests/logging/src/test/java/example/app/geode/logging/ApacheGeodeLoggingApplicationSmokeTests.java +++ b/spring-geode-tests/smoke-tests/logging/src/test/java/example/app/geode/logging/ApacheGeodeLoggingApplicationSmokeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/AbstractSpringConfiguredLogLevelPropertyIntegrationTests.java b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/AbstractSpringConfiguredLogLevelPropertyIntegrationTests.java index 1f803f3f9..b5d6bb4b3 100644 --- a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/AbstractSpringConfiguredLogLevelPropertyIntegrationTests.java +++ b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/AbstractSpringConfiguredLogLevelPropertyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringBootDataGemFireLogLevelApplicationPropertyIntegrationTests.java b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringBootDataGemFireLogLevelApplicationPropertyIntegrationTests.java index 7c37d531f..a04d3598a 100644 --- a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringBootDataGemFireLogLevelApplicationPropertyIntegrationTests.java +++ b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringBootDataGemFireLogLevelApplicationPropertyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringBootDataGemFireLogLevelSystemPropertyIntegrationTests.java b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringBootDataGemFireLogLevelSystemPropertyIntegrationTests.java index dd5e8b23b..74d94c4a3 100644 --- a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringBootDataGemFireLogLevelSystemPropertyIntegrationTests.java +++ b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringBootDataGemFireLogLevelSystemPropertyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireCacheLogLevelApplicationPropertyIntegrationTests.java b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireCacheLogLevelApplicationPropertyIntegrationTests.java index 50aa4646e..02d88bc0d 100644 --- a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireCacheLogLevelApplicationPropertyIntegrationTests.java +++ b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireCacheLogLevelApplicationPropertyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireCacheLogLevelSystemPropertyIntegrationTests.java b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireCacheLogLevelSystemPropertyIntegrationTests.java index 69258136a..458973ea1 100644 --- a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireCacheLogLevelSystemPropertyIntegrationTests.java +++ b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireCacheLogLevelSystemPropertyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireLoggingLevelApplicationPropertyIntegrationTests.java b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireLoggingLevelApplicationPropertyIntegrationTests.java index 98cfda8b6..d0cd0b671 100644 --- a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireLoggingLevelApplicationPropertyIntegrationTests.java +++ b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireLoggingLevelApplicationPropertyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireLoggingLevelSystemPropertyIntegrationTests.java b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireLoggingLevelSystemPropertyIntegrationTests.java index 0f3672b15..ac74a8e40 100644 --- a/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireLoggingLevelSystemPropertyIntegrationTests.java +++ b/spring-geode-tests/smoke-tests/logging/src/test/java/org/springframework/geode/context/logging/SpringDataGemFireLoggingLevelSystemPropertyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/hamcrest/RegexMatcher.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/hamcrest/RegexMatcher.java index 4f42ae4c2..f46b8899c 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/hamcrest/RegexMatcher.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/hamcrest/RegexMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/security/AuthenticationException.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/security/AuthenticationException.java index 5531bfe20..207d0a950 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/security/AuthenticationException.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/security/AuthenticationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/HttpSessionAdapter.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/HttpSessionAdapter.java index 3cd16475f..7a63f2d5f 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/HttpSessionAdapter.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/HttpSessionAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SessionUtils.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SessionUtils.java index b9e42fc45..9f4d68290 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SessionUtils.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SessionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SpringSessionSubstitutingSpyRequestPostProcessor.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SpringSessionSubstitutingSpyRequestPostProcessor.java index 7a2cd69ff..86bd7d714 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SpringSessionSubstitutingSpyRequestPostProcessor.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SpringSessionSubstitutingSpyRequestPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/AbstractHttpSession.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/AbstractHttpSession.java index 974c5c3d1..25f444bfa 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/AbstractHttpSession.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/AbstractHttpSession.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/HttpSessionProxy.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/HttpSessionProxy.java index e75c9ffac..0903e673e 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/HttpSessionProxy.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/HttpSessionProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/test/java/example/app/geode/caching/session/MockPersistentSessionAccessSmokeTests.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/test/java/example/app/geode/caching/session/MockPersistentSessionAccessSmokeTests.java index 8b2d8cc21..ebc56f8b4 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/test/java/example/app/geode/caching/session/MockPersistentSessionAccessSmokeTests.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/test/java/example/app/geode/caching/session/MockPersistentSessionAccessSmokeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/DatabaseWithLookAsideCachingApplication.java b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/DatabaseWithLookAsideCachingApplication.java index 090d4f765..d1aa8a41c 100644 --- a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/DatabaseWithLookAsideCachingApplication.java +++ b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/DatabaseWithLookAsideCachingApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java index e713774f6..29afe6663 100644 --- a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java +++ b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/repo/ContactRepository.java b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/repo/ContactRepository.java index ee8c4e928..aed0de63d 100644 --- a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/repo/ContactRepository.java +++ b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/repo/ContactRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/service/ContactsService.java b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/service/ContactsService.java index 759727fc7..980b12a2d 100644 --- a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/service/ContactsService.java +++ b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/service/ContactsService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/multi-store/src/test/java/example/app/DatabaseWithLookAsideCachingApplicationSmokeTests.java b/spring-geode-tests/smoke-tests/multi-store/src/test/java/example/app/DatabaseWithLookAsideCachingApplicationSmokeTests.java index 2ad9b2280..9dded75a5 100644 --- a/spring-geode-tests/smoke-tests/multi-store/src/test/java/example/app/DatabaseWithLookAsideCachingApplicationSmokeTests.java +++ b/spring-geode-tests/smoke-tests/multi-store/src/test/java/example/app/DatabaseWithLookAsideCachingApplicationSmokeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/peer-cache-application/src/main/java/example/app/geode/cache/peer/SpringBootApacheGeodePeerCacheApplication.java b/spring-geode-tests/smoke-tests/peer-cache-application/src/main/java/example/app/geode/cache/peer/SpringBootApacheGeodePeerCacheApplication.java index 509fcf9d3..91b380eb3 100644 --- a/spring-geode-tests/smoke-tests/peer-cache-application/src/main/java/example/app/geode/cache/peer/SpringBootApacheGeodePeerCacheApplication.java +++ b/spring-geode-tests/smoke-tests/peer-cache-application/src/main/java/example/app/geode/cache/peer/SpringBootApacheGeodePeerCacheApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/peer-cache-application/src/test/java/example/app/geode/cache/peer/SpringBootApacheGeodePeerCacheApplicationUnitTests.java b/spring-geode-tests/smoke-tests/peer-cache-application/src/test/java/example/app/geode/cache/peer/SpringBootApacheGeodePeerCacheApplicationUnitTests.java index 3ef700daa..c71a90f46 100644 --- a/spring-geode-tests/smoke-tests/peer-cache-application/src/test/java/example/app/geode/cache/peer/SpringBootApacheGeodePeerCacheApplicationUnitTests.java +++ b/spring-geode-tests/smoke-tests/peer-cache-application/src/test/java/example/app/geode/cache/peer/SpringBootApacheGeodePeerCacheApplicationUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/spring-initializer/src/main/java/example/app/InitializerApplication.java b/spring-geode-tests/smoke-tests/spring-initializer/src/main/java/example/app/InitializerApplication.java index 99239416f..c97c955d2 100644 --- a/spring-geode-tests/smoke-tests/spring-initializer/src/main/java/example/app/InitializerApplication.java +++ b/spring-geode-tests/smoke-tests/spring-initializer/src/main/java/example/app/InitializerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode-tests/smoke-tests/spring-initializer/src/test/java/example/app/InitializerApplicationSmokeTests.java b/spring-geode-tests/smoke-tests/spring-initializer/src/test/java/example/app/InitializerApplicationSmokeTests.java index e0d8c76d1..b94d513ee 100644 --- a/spring-geode-tests/smoke-tests/spring-initializer/src/test/java/example/app/InitializerApplicationSmokeTests.java +++ b/spring-geode-tests/smoke-tests/spring-initializer/src/test/java/example/app/InitializerApplicationSmokeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurer.java b/spring-geode/src/main/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurer.java index d20024647..b400ded0d 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurer.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/InlineCachingRegionConfigurer.java b/spring-geode/src/main/java/org/springframework/geode/cache/InlineCachingRegionConfigurer.java index f22a7cb1a..2be727743 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/InlineCachingRegionConfigurer.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/InlineCachingRegionConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java index 035002f7b..37f97b08f 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheLoader.java b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheLoader.java index 0b78ba171..6144c8901 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheLoader.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheLoaderRegionConfigurer.java b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheLoaderRegionConfigurer.java index 0981b3152..080d11213 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheLoaderRegionConfigurer.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheLoaderRegionConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheWriter.java b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheWriter.java index c45f4edf7..e618e9686 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheWriter.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheWriterRegionConfigurer.java b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheWriterRegionConfigurer.java index 9ef725f7c..568b6ff36 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheWriterRegionConfigurer.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryCacheWriterRegionConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java b/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java index 3eff67dcf..af3457d70 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheWriterSupport.java b/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheWriterSupport.java index 55e91854f..cc3b293e2 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheWriterSupport.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheWriterSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupport.java b/spring-geode/src/main/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupport.java index 12d7b2d81..592469da6 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupport.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java index 3658c5742..df87f92a6 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAwareConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAwareConfiguration.java index a06687709..a88dfde44 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAwareConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAwareConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfiguration.java index 00af3a253..f1b8fe8e1 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableException.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableException.java index 45011e894..e2de219ee 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableException.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableException.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/DistributedSystemIdConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/DistributedSystemIdConfiguration.java index 9d4f59f8d..9d8419580 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/DistributedSystemIdConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/DistributedSystemIdConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/DurableClientConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/DurableClientConfiguration.java index 511f6d8b4..39231de80 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/DurableClientConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/DurableClientConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java index c6729fb85..843b0e75b 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableDurableClient.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableDurableClient.java index 4139a9a28..a8d894740 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableDurableClient.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableDurableClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManager.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManager.java index 577a1c49b..bc985b0b3 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManager.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManagerProxy.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManagerProxy.java index 5f4206528..759ef0857 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManagerProxy.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManagerProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/GroupsConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/GroupsConfiguration.java index 92e2748ea..80d6ca175 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/GroupsConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/GroupsConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/LocatorsConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/LocatorsConfiguration.java index ebc0e2bf4..2db9b0165 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/LocatorsConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/LocatorsConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java index f0a57d143..480e519ad 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerConfiguration.java index 41cababcd..c042b6f3f 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java index 4fb418932..d6facfbc4 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseDistributedSystemId.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseDistributedSystemId.java index a53440ace..06ebc7934 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseDistributedSystemId.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseDistributedSystemId.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseGroups.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseGroups.java index dd7ec684e..6ded6ef50 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseGroups.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseGroups.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseLocators.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseLocators.java index b226c0f3b..deeceaa68 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseLocators.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseLocators.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java index c8aed0878..9963c1dfb 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/support/TypelessAnnotationConfigSupport.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/support/TypelessAnnotationConfigSupport.java index 1449403e0..a80557f04 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/support/TypelessAnnotationConfigSupport.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/support/TypelessAnnotationConfigSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java b/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java index 7e359a7c9..f5a9e948d 100644 --- a/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java +++ b/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/context/logging/EnvironmentLoggingApplicationListener.java b/spring-geode/src/main/java/org/springframework/geode/context/logging/EnvironmentLoggingApplicationListener.java index d5dc7fcac..469377fca 100644 --- a/spring-geode/src/main/java/org/springframework/geode/context/logging/EnvironmentLoggingApplicationListener.java +++ b/spring-geode/src/main/java/org/springframework/geode/context/logging/EnvironmentLoggingApplicationListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/context/logging/GeodeLoggingApplicationListener.java b/spring-geode/src/main/java/org/springframework/geode/context/logging/GeodeLoggingApplicationListener.java index e72cbb8e3..c573806c7 100644 --- a/spring-geode/src/main/java/org/springframework/geode/context/logging/GeodeLoggingApplicationListener.java +++ b/spring-geode/src/main/java/org/springframework/geode/context/logging/GeodeLoggingApplicationListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/env/EnvironmentMapAdapter.java b/spring-geode/src/main/java/org/springframework/geode/core/env/EnvironmentMapAdapter.java index e0aee2e1e..d5fe97504 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/env/EnvironmentMapAdapter.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/env/EnvironmentMapAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java b/spring-geode/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java index 03b30efae..c7ae0a49a 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java b/spring-geode/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java index 153b62085..79c2828d8 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/env/support/Service.java b/spring-geode/src/main/java/org/springframework/geode/core/env/support/Service.java index a6c357130..4d53106e7 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/env/support/Service.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/env/support/Service.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/env/support/User.java b/spring-geode/src/main/java/org/springframework/geode/core/env/support/User.java index f93999538..c317c2c92 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/env/support/User.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/env/support/User.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/AbstractResourceReader.java b/spring-geode/src/main/java/org/springframework/geode/core/io/AbstractResourceReader.java index cef8ee90a..cf0f5f3e2 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/AbstractResourceReader.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/AbstractResourceReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/AbstractResourceWriter.java b/spring-geode/src/main/java/org/springframework/geode/core/io/AbstractResourceWriter.java index 112c6fc82..74ea7da51 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/AbstractResourceWriter.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/AbstractResourceWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceDataAccessException.java b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceDataAccessException.java index 5075636c5..6bf3fdad1 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceDataAccessException.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceNotFoundException.java b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceNotFoundException.java index c42b36da5..40170c5ac 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceNotFoundException.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceReadException.java b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceReadException.java index 86109140e..dab84764f 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceReadException.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceReadException.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceReader.java b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceReader.java index 23d6bdcbe..69b45dc25 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceReader.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceResolver.java b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceResolver.java index b12d4736e..6558d38d8 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceResolver.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceWriteException.java b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceWriteException.java index 8199ab088..f09988229 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceWriteException.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceWriteException.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceWriter.java b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceWriter.java index 883eec3de..a0b2ea45b 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceWriter.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/UnhandledResourceException.java b/spring-geode/src/main/java/org/springframework/geode/core/io/UnhandledResourceException.java index e5d6709b2..30f01faf9 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/UnhandledResourceException.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/UnhandledResourceException.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ByteArrayResourceReader.java b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ByteArrayResourceReader.java index da707a85c..8d86efac7 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ByteArrayResourceReader.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ByteArrayResourceReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/support/FileResourceWriter.java b/spring-geode/src/main/java/org/springframework/geode/core/io/support/FileResourceWriter.java index c7c6d149f..78a05e7d3 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/support/FileResourceWriter.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/support/FileResourceWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolver.java b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolver.java index 36198ede6..f8e88be55 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolver.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourcePrefix.java b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourcePrefix.java index a18a8b3d9..2107e5956 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourcePrefix.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourcePrefix.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceUtils.java b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceUtils.java index e4f43fe88..741134b74 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceUtils.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/support/SingleResourceResolver.java b/spring-geode/src/main/java/org/springframework/geode/core/io/support/SingleResourceResolver.java index 171d23511..421852597 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/support/SingleResourceResolver.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/support/SingleResourceResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectAwareUtils.java b/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectAwareUtils.java index 655958f3e..356763550 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectAwareUtils.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectAwareUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectUtils.java b/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectUtils.java index 66d1e10f9..0d621561f 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectUtils.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/util/SpringExtensions.java b/spring-geode/src/main/java/org/springframework/geode/core/util/SpringExtensions.java index 0a847f030..3fff8fe61 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/util/SpringExtensions.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/util/SpringExtensions.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/util/function/FunctionUtils.java b/spring-geode/src/main/java/org/springframework/geode/core/util/function/FunctionUtils.java index 922f897b1..723d9bff5 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/util/function/FunctionUtils.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/util/function/FunctionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/AbstractCacheDataImporterExporter.java b/spring-geode/src/main/java/org/springframework/geode/data/AbstractCacheDataImporterExporter.java index 1e0e81097..2430a584d 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/AbstractCacheDataImporterExporter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/AbstractCacheDataImporterExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/CacheDataExporter.java b/spring-geode/src/main/java/org/springframework/geode/data/CacheDataExporter.java index 552fb6690..cd248af36 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/CacheDataExporter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/CacheDataExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/CacheDataImporter.java b/spring-geode/src/main/java/org/springframework/geode/data/CacheDataImporter.java index 6177aa90c..94a5fc985 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/CacheDataImporter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/CacheDataImporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/CacheDataImporterExporter.java b/spring-geode/src/main/java/org/springframework/geode/data/CacheDataImporterExporter.java index b2bd67bea..d2ee38744 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/CacheDataImporterExporter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/CacheDataImporterExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/JsonCacheDataImporterExporter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/JsonCacheDataImporterExporter.java index 57d34fa39..833c01c65 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/JsonCacheDataImporterExporter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/JsonCacheDataImporterExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/AbstractObjectArrayToJsonConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/AbstractObjectArrayToJsonConverter.java index d8a32f2bf..ddf102bca 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/AbstractObjectArrayToJsonConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/AbstractObjectArrayToJsonConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToObjectArrayConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToObjectArrayConverter.java index a7ce2d016..751d1d7db 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToObjectArrayConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToObjectArrayConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToObjectConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToObjectConverter.java index dfd1653cf..28f6bdfec 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToObjectConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToObjectConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToPdxArrayConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToPdxArrayConverter.java index 1b6645e0d..a741dee6d 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToPdxArrayConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToPdxArrayConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToPdxConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToPdxConverter.java index a9ebbe869..24d068703 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToPdxConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/JsonToPdxConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/ObjectArrayToJsonConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/ObjectArrayToJsonConverter.java index 03949a590..63ed2a489 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/ObjectArrayToJsonConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/ObjectArrayToJsonConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/ObjectToJsonConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/ObjectToJsonConverter.java index d19201d5b..b59a5afb2 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/ObjectToJsonConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/ObjectToJsonConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JSONFormatterJsonToPdxConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JSONFormatterJsonToPdxConverter.java index 42f9fe081..a218d7ca0 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JSONFormatterJsonToPdxConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JSONFormatterJsonToPdxConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JSONFormatterPdxToJsonConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JSONFormatterPdxToJsonConverter.java index 41bd19e74..93165a712 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JSONFormatterPdxToJsonConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JSONFormatterPdxToJsonConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonJsonToObjectConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonJsonToObjectConverter.java index 6dff722a6..fee08ddae 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonJsonToObjectConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonJsonToObjectConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonJsonToPdxConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonJsonToPdxConverter.java index 57ab73c6a..bd9f3a833 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonJsonToPdxConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonJsonToPdxConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverter.java index 1b92d4002..e70c3ca23 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/support/LifecycleAwareCacheDataImporterExporter.java b/spring-geode/src/main/java/org/springframework/geode/data/support/LifecycleAwareCacheDataImporterExporter.java index 303d97676..0189651cc 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/support/LifecycleAwareCacheDataImporterExporter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/support/LifecycleAwareCacheDataImporterExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/data/support/ResourceCapableCacheDataImporterExporter.java b/spring-geode/src/main/java/org/springframework/geode/data/support/ResourceCapableCacheDataImporterExporter.java index c1812a52a..7683ac8b4 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/support/ResourceCapableCacheDataImporterExporter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/support/ResourceCapableCacheDataImporterExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/distributed/event/ApplicationContextMembershipListener.java b/spring-geode/src/main/java/org/springframework/geode/distributed/event/ApplicationContextMembershipListener.java index 0cca33b21..43a92479c 100644 --- a/spring-geode/src/main/java/org/springframework/geode/distributed/event/ApplicationContextMembershipListener.java +++ b/spring-geode/src/main/java/org/springframework/geode/distributed/event/ApplicationContextMembershipListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/expression/SmartEnvironmentAccessor.java b/spring-geode/src/main/java/org/springframework/geode/expression/SmartEnvironmentAccessor.java index 643004e23..d4b90b4b3 100644 --- a/spring-geode/src/main/java/org/springframework/geode/expression/SmartEnvironmentAccessor.java +++ b/spring-geode/src/main/java/org/springframework/geode/expression/SmartEnvironmentAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/function/config/AbstractFunctionExecutionAutoConfigurationExtension.java b/spring-geode/src/main/java/org/springframework/geode/function/config/AbstractFunctionExecutionAutoConfigurationExtension.java index 7103a6b52..64a81d0c7 100644 --- a/spring-geode/src/main/java/org/springframework/geode/function/config/AbstractFunctionExecutionAutoConfigurationExtension.java +++ b/spring-geode/src/main/java/org/springframework/geode/function/config/AbstractFunctionExecutionAutoConfigurationExtension.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java b/spring-geode/src/main/java/org/springframework/geode/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java index ec3dd7d37..b091a4ccd 100644 --- a/spring-geode/src/main/java/org/springframework/geode/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java +++ b/spring-geode/src/main/java/org/springframework/geode/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java b/spring-geode/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java index a2868f4a3..d79b76d6a 100644 --- a/spring-geode/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java +++ b/spring-geode/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java b/spring-geode/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java index 8b27c3911..bd46094fe 100644 --- a/spring-geode/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java +++ b/spring-geode/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/BigDecimalSerializer.java b/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/BigDecimalSerializer.java index 702ce3f03..7c247b559 100644 --- a/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/BigDecimalSerializer.java +++ b/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/BigDecimalSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/BigIntegerSerializer.java b/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/BigIntegerSerializer.java index 887b27f81..83a00ce1b 100644 --- a/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/BigIntegerSerializer.java +++ b/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/BigIntegerSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/TypelessCollectionSerializer.java b/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/TypelessCollectionSerializer.java index e0640dd96..e609c2fbf 100644 --- a/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/TypelessCollectionSerializer.java +++ b/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/TypelessCollectionSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/pdx/MappingPdxSerializerIncludedTypesRegistrar.java b/spring-geode/src/main/java/org/springframework/geode/pdx/MappingPdxSerializerIncludedTypesRegistrar.java index bd16444af..4bcb731bb 100644 --- a/spring-geode/src/main/java/org/springframework/geode/pdx/MappingPdxSerializerIncludedTypesRegistrar.java +++ b/spring-geode/src/main/java/org/springframework/geode/pdx/MappingPdxSerializerIncludedTypesRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/pdx/ObjectPdxInstanceAdapter.java b/spring-geode/src/main/java/org/springframework/geode/pdx/ObjectPdxInstanceAdapter.java index f344189d0..f8a9a48cf 100644 --- a/spring-geode/src/main/java/org/springframework/geode/pdx/ObjectPdxInstanceAdapter.java +++ b/spring-geode/src/main/java/org/springframework/geode/pdx/ObjectPdxInstanceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java b/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java index 2c057ab06..9d43e8261 100644 --- a/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java +++ b/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerSupport.java b/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerSupport.java index 4a3742233..1bd13b198 100644 --- a/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerSupport.java +++ b/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/main/java/org/springframework/geode/test/context/TestRefreshableApplicationContextLoader.java b/spring-geode/src/main/java/org/springframework/geode/test/context/TestRefreshableApplicationContextLoader.java index 8a635e078..5195def1e 100644 --- a/spring-geode/src/main/java/org/springframework/geode/test/context/TestRefreshableApplicationContextLoader.java +++ b/spring-geode/src/main/java/org/springframework/geode/test/context/TestRefreshableApplicationContextLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java b/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java index 2e490dd9e..66dd6073b 100644 --- a/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java +++ b/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java b/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java index 4d4d9824b..1a928981b 100644 --- a/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java +++ b/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/example/app/crm/model/Customer.java b/spring-geode/src/test/java/example/app/crm/model/Customer.java index 7190b09ca..a0188c24f 100644 --- a/spring-geode/src/test/java/example/app/crm/model/Customer.java +++ b/spring-geode/src/test/java/example/app/crm/model/Customer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/example/app/crm/repo/CustomerRepository.java b/spring-geode/src/test/java/example/app/crm/repo/CustomerRepository.java index 1b7a7402d..f4ac5cb29 100644 --- a/spring-geode/src/test/java/example/app/crm/repo/CustomerRepository.java +++ b/spring-geode/src/test/java/example/app/crm/repo/CustomerRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/example/app/crm/service/CustomerService.java b/spring-geode/src/test/java/example/app/crm/service/CustomerService.java index 4573a1904..baa8cb58c 100644 --- a/spring-geode/src/test/java/example/app/crm/service/CustomerService.java +++ b/spring-geode/src/test/java/example/app/crm/service/CustomerService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/example/app/env/EnvironmentUsingSpringBootApplication.java b/spring-geode/src/test/java/example/app/env/EnvironmentUsingSpringBootApplication.java index 63a21903a..23f7c46ff 100644 --- a/spring-geode/src/test/java/example/app/env/EnvironmentUsingSpringBootApplication.java +++ b/spring-geode/src/test/java/example/app/env/EnvironmentUsingSpringBootApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/example/app/pos/model/LineItem.java b/spring-geode/src/test/java/example/app/pos/model/LineItem.java index 3aee24ed0..115acf00b 100644 --- a/spring-geode/src/test/java/example/app/pos/model/LineItem.java +++ b/spring-geode/src/test/java/example/app/pos/model/LineItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/example/app/pos/model/Product.java b/spring-geode/src/test/java/example/app/pos/model/Product.java index b8eb0a186..d1c56b877 100644 --- a/spring-geode/src/test/java/example/app/pos/model/Product.java +++ b/spring-geode/src/test/java/example/app/pos/model/Product.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/example/app/pos/model/PurchaseOrder.java b/spring-geode/src/test/java/example/app/pos/model/PurchaseOrder.java index 989fd93e7..a7af21118 100644 --- a/spring-geode/src/test/java/example/app/pos/model/PurchaseOrder.java +++ b/spring-geode/src/test/java/example/app/pos/model/PurchaseOrder.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerIntegrationTests.java index d1f9319ab..6e22e5894 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerUnitTests.java index 30a74219d..07acd9cfe 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerWithUserDefinedAsyncEventOperationRepositoryFunctionAndCustomAsyncEventErrorHandlerIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerWithUserDefinedAsyncEventOperationRepositoryFunctionAndCustomAsyncEventErrorHandlerIntegrationTests.java index af7395896..8323cbe13 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerWithUserDefinedAsyncEventOperationRepositoryFunctionAndCustomAsyncEventErrorHandlerIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerWithUserDefinedAsyncEventOperationRepositoryFunctionAndCustomAsyncEventErrorHandlerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/InlineCachingRegionConfigurerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/InlineCachingRegionConfigurerUnitTests.java index b4cf07f98..5c07b2fcc 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/InlineCachingRegionConfigurerUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/InlineCachingRegionConfigurerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryAsyncEventListenerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryAsyncEventListenerUnitTests.java index 056d133be..457384014 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryAsyncEventListenerUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryAsyncEventListenerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheLoaderRegionConfigurerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheLoaderRegionConfigurerUnitTests.java index 02652733c..918d92a7d 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheLoaderRegionConfigurerUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheLoaderRegionConfigurerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheLoaderUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheLoaderUnitTests.java index 23e51d185..22659626f 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheLoaderUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheLoaderUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheWriterRegionConfigurerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheWriterRegionConfigurerUnitTests.java index 4f6e4166d..9acdd91e1 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheWriterRegionConfigurerUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheWriterRegionConfigurerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheWriterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheWriterUnitTests.java index 5b05219e4..9804fded2 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheWriterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheWriterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/SpringCachingWithMockObjectsUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/SpringCachingWithMockObjectsUnitTests.java index cde289f94..0e929af36 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/SpringCachingWithMockObjectsUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/SpringCachingWithMockObjectsUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/inline/AbstractInlineCachingWithExternalDataSourceIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/inline/AbstractInlineCachingWithExternalDataSourceIntegrationTests.java index 7df5dba77..4a6daddc0 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/inline/AbstractInlineCachingWithExternalDataSourceIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/inline/AbstractInlineCachingWithExternalDataSourceIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/inline/cassandra/InlineCachingWithCassandraIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/inline/cassandra/InlineCachingWithCassandraIntegrationTests.java index 2ab6300a6..3e34a0a31 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/inline/cassandra/InlineCachingWithCassandraIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/inline/cassandra/InlineCachingWithCassandraIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/inline/database/InlineCachingWithDatabaseIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/inline/database/InlineCachingWithDatabaseIntegrationTests.java index 11402ceb6..b250d049d 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/inline/database/InlineCachingWithDatabaseIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/inline/database/InlineCachingWithDatabaseIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupportUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupportUnitTests.java index 7024180cf..a02787d0b 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupportUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupportUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java index 3fc785f4a..68d903a09 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java index 1958912d9..2cbf21007 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAwareConfigurationUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAwareConfigurationUnitTests.java index ab57e29a1..061722e8f 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAwareConfigurationUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAwareConfigurationUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java index 4f565bbbe..4e192f74e 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/DistributedSystemIdConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/DistributedSystemIdConfigurationIntegrationTests.java index f4b28497e..5103ea160 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/DistributedSystemIdConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/DistributedSystemIdConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/DurableClientConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/DurableClientConfigurationIntegrationTests.java index 6f5a1f7fc..8b56cb938 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/DurableClientConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/DurableClientConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/GroupsConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/GroupsConfigurationIntegrationTests.java index 06e52d92a..a232df18c 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/GroupsConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/GroupsConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java index 1468b32fa..32961bea9 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/LocatorsConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/LocatorsConfigurationIntegrationTests.java index d37b22d2a..315d19ca9 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/LocatorsConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/LocatorsConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/MemberNameConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/MemberNameConfigurationIntegrationTests.java index 384d5c353..79983b1b3 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/MemberNameConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/MemberNameConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/MemberNameOverridesCacheNameIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/MemberNameOverridesCacheNameIntegrationTests.java index d4487f75b..7f8df5f63 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/MemberNameOverridesCacheNameIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/MemberNameOverridesCacheNameIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/PropertyConfiguredStrictMatchingClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/PropertyConfiguredStrictMatchingClusterNotAvailableConfigurationIntegrationTests.java index 109010b44..8f59e0803 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/PropertyConfiguredStrictMatchingClusterNotAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/PropertyConfiguredStrictMatchingClusterNotAvailableConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/SecurityManagerConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/SecurityManagerConfigurationIntegrationTests.java index 737873679..93d3663d8 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/SecurityManagerConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/SecurityManagerConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/StrictMatchingClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/StrictMatchingClusterNotAvailableConfigurationIntegrationTests.java index d5edf7ca9..5deb64cd5 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/StrictMatchingClusterNotAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/StrictMatchingClusterNotAvailableConfigurationIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContextIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContextIntegrationTests.java index 985f9e2a0..2e1f4aeb3 100644 --- a/spring-geode/src/test/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContextIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContextIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/context/logging/EnvironmentLoggingApplicationListenerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/context/logging/EnvironmentLoggingApplicationListenerUnitTests.java index f1241876c..110e9df45 100644 --- a/spring-geode/src/test/java/org/springframework/geode/context/logging/EnvironmentLoggingApplicationListenerUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/context/logging/EnvironmentLoggingApplicationListenerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/context/logging/GeodeLoggingApplicationListenerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/context/logging/GeodeLoggingApplicationListenerUnitTests.java index 04250a1ec..fd932eca4 100644 --- a/spring-geode/src/test/java/org/springframework/geode/context/logging/GeodeLoggingApplicationListenerUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/context/logging/GeodeLoggingApplicationListenerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/env/EnvironmentMapAdapterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/env/EnvironmentMapAdapterUnitTests.java index 4b674e4d1..72b6dc25a 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/env/EnvironmentMapAdapterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/env/EnvironmentMapAdapterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java index a6335b346..9621460d6 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java index ab76dfbd9..1ebf23c0a 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java index e1768d4eb..8e9e1c215 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java index 73f4d67f7..b021e41e6 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/AbstractResourceReaderUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/AbstractResourceReaderUnitTests.java index 8b68c29b3..8b6e8a38d 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/AbstractResourceReaderUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/AbstractResourceReaderUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/AbstractResourceWriterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/AbstractResourceWriterUnitTests.java index f38c84a99..202ecada8 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/AbstractResourceWriterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/AbstractResourceWriterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceReaderUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceReaderUnitTests.java index fddcc4c4b..d805c0764 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceReaderUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceReaderUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceResolverUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceResolverUnitTests.java index fc5c580a7..2b1ca5cbd 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceResolverUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceResolverUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceWriterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceWriterUnitTests.java index ebe95cdf8..253d53943 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceWriterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/ResourceWriterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/support/ByteArrayResourceReaderUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/support/ByteArrayResourceReaderUnitTests.java index c341b0480..5b70939b4 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/support/ByteArrayResourceReaderUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/support/ByteArrayResourceReaderUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/support/FileResourceWriterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/support/FileResourceWriterUnitTests.java index 013ddee06..2c8e53124 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/support/FileResourceWriterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/support/FileResourceWriterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolverUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolverUnitTests.java index 1bf7b8b08..2f1f12779 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolverUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolverUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourcePrefixUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourcePrefixUnitTests.java index ebcdad7a8..be94304f7 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourcePrefixUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourcePrefixUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourceUtilsUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourceUtilsUnitTests.java index b92cf59f6..ff895a528 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourceUtilsUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/support/ResourceUtilsUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/io/support/SingleResourceResolverUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/io/support/SingleResourceResolverUnitTests.java index e4162cc7d..d87dd0cc4 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/io/support/SingleResourceResolverUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/io/support/SingleResourceResolverUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/util/ObjectAwareUtilsUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/util/ObjectAwareUtilsUnitTests.java index 562992e5f..4b6789651 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/util/ObjectAwareUtilsUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/util/ObjectAwareUtilsUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java index 06bb9a437..9eeea37bf 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/util/SpringExtensionsUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/util/SpringExtensionsUnitTests.java index cc7398e59..b7b5ffa33 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/util/SpringExtensionsUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/util/SpringExtensionsUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/core/util/function/FunctionUtilsUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/util/function/FunctionUtilsUnitTests.java index 200004b0c..696f1aef5 100644 --- a/spring-geode/src/test/java/org/springframework/geode/core/util/function/FunctionUtilsUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/core/util/function/FunctionUtilsUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/AbstractCacheDataImporterExporterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/AbstractCacheDataImporterExporterUnitTests.java index 42bb1288e..360639771 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/AbstractCacheDataImporterExporterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/AbstractCacheDataImporterExporterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/CacheDataExporterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/CacheDataExporterUnitTests.java index 4c1279f96..2cd446e61 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/CacheDataExporterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/CacheDataExporterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/CacheDataImporterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/CacheDataImporterUnitTests.java index 93a942070..d63358c3c 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/CacheDataImporterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/CacheDataImporterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterIntegrationTests.java index 40980ca14..13ee958d1 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterUnitTests.java index 7fbc44fd8..87881782f 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonClientCacheDataImporterExporterIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonClientCacheDataImporterExporterIntegrationTests.java index 782ac74b8..9af39ee69 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonClientCacheDataImporterExporterIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonClientCacheDataImporterExporterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/AbstractObjectArrayToJsonConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/AbstractObjectArrayToJsonConverterUnitTests.java index 0af748ccc..584ec6383 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/AbstractObjectArrayToJsonConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/AbstractObjectArrayToJsonConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToObjectArrayConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToObjectArrayConverterUnitTests.java index 52e0f80bd..5b7e842a7 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToObjectArrayConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToObjectArrayConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToObjectConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToObjectConverterUnitTests.java index 91ca492e8..ef71fbbf5 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToObjectConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToObjectConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToPdxArrayConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToPdxArrayConverterUnitTests.java index c2af173de..b654b1a4f 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToPdxArrayConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToPdxArrayConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToPdxConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToPdxConverterUnitTests.java index 887bdf14b..41400c972 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToPdxConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/JsonToPdxConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/ObjectArrayToJsonConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/ObjectArrayToJsonConverterUnitTests.java index 098381393..ac351813a 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/ObjectArrayToJsonConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/ObjectArrayToJsonConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JSONFormatterJsonToPdxConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JSONFormatterJsonToPdxConverterUnitTests.java index dfe7c3ba6..643f5f5f4 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JSONFormatterJsonToPdxConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JSONFormatterJsonToPdxConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JSONFormatterPdxToJsonConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JSONFormatterPdxToJsonConverterUnitTests.java index fe329355a..4483daec6 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JSONFormatterPdxToJsonConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JSONFormatterPdxToJsonConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonJsonToObjectConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonJsonToObjectConverterUnitTests.java index 26f9c3b2f..f22109f53 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonJsonToObjectConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonJsonToObjectConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonJsonToPdxConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonJsonToPdxConverterUnitTests.java index dca96392f..a89a22a98 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonJsonToPdxConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonJsonToPdxConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverterUnitTests.java index 775b8b80b..8416c7b0b 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/support/LifecycleAwareCacheDataImporterExporterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/support/LifecycleAwareCacheDataImporterExporterUnitTests.java index 6d54efac5..be19ac95a 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/support/LifecycleAwareCacheDataImporterExporterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/support/LifecycleAwareCacheDataImporterExporterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/data/support/ResourceCapableCacheDataImporterExporterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/support/ResourceCapableCacheDataImporterExporterUnitTests.java index b7c589fc3..c0bb893b6 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/support/ResourceCapableCacheDataImporterExporterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/support/ResourceCapableCacheDataImporterExporterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/distributed/event/ApplicationContextMembershipListenerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/distributed/event/ApplicationContextMembershipListenerUnitTests.java index 6829da631..ffb08597e 100644 --- a/spring-geode/src/test/java/org/springframework/geode/distributed/event/ApplicationContextMembershipListenerUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/distributed/event/ApplicationContextMembershipListenerUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/expression/SmartEnvironmentAccessorUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/expression/SmartEnvironmentAccessorUnitTests.java index e1f3d79eb..79e5390a2 100644 --- a/spring-geode/src/test/java/org/springframework/geode/expression/SmartEnvironmentAccessorUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/expression/SmartEnvironmentAccessorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java index 4b6724746..f6d649b8d 100644 --- a/spring-geode/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java index 799dee939..38710b017 100644 --- a/spring-geode/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/pdx/MappingPdxSerializerIncludedTypesRegistrarUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/pdx/MappingPdxSerializerIncludedTypesRegistrarUnitTests.java index 586228408..0e278290d 100644 --- a/spring-geode/src/test/java/org/springframework/geode/pdx/MappingPdxSerializerIncludedTypesRegistrarUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/pdx/MappingPdxSerializerIncludedTypesRegistrarUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/pdx/ObjectPdxInstanceAdapterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/pdx/ObjectPdxInstanceAdapterUnitTests.java index 254d17bf7..0a44e7cfe 100644 --- a/spring-geode/src/test/java/org/springframework/geode/pdx/ObjectPdxInstanceAdapterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/pdx/ObjectPdxInstanceAdapterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java index 955742644..ca7b569cb 100644 --- a/spring-geode/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java index 3a119c067..4cd846a6c 100644 --- a/spring-geode/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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. diff --git a/spring-geode/src/test/java/org/springframework/geode/test/context/TestRefreshableApplicationContextLoaderIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/test/context/TestRefreshableApplicationContextLoaderIntegrationTests.java index 5bf47e56f..7c6f4cf86 100644 --- a/spring-geode/src/test/java/org/springframework/geode/test/context/TestRefreshableApplicationContextLoaderIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/test/context/TestRefreshableApplicationContextLoaderIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2017-present 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 7fe690108a9c090cdf4790ce42bd9e5a48c33395 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 2 Mar 2022 13:54:13 -0800 Subject: [PATCH 022/201] Fix bug when parsing Spring Boot, spring.session.timeout property with java.time.Duration styling. Resolves gh-113. --- .../SpringSessionAutoConfiguration.java | 23 +++++- .../SpringSessionProperties.java | 13 +++- ...ringSessionPropertiesIntegrationTests.java | 2 +- ...tionTimeoutInTimeUnitIntegrationTests.java | 78 +++++++++++++++++++ ...figuredSessionCachingIntegrationTests.java | 6 +- .../SessionExpirationIntegrationTests.java | 5 +- ...pirationTimeoutInDaysIntegrationTests.java | 49 ++++++++++++ ...irationTimeoutInHoursIntegrationTests.java | 49 ++++++++++++ ...TimeoutInMillisecondsIntegrationTests.java | 53 +++++++++++++ ...ationTimeoutInMinutesIntegrationTests.java | 49 ++++++++++++ ...ationTimeoutInSecondsIntegrationTests.java | 49 ++++++++++++ 11 files changed, 368 insertions(+), 8 deletions(-) create mode 100644 spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests.java create mode 100644 spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInDaysIntegrationTests.java create mode 100644 spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInHoursIntegrationTests.java create mode 100644 spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInMillisecondsIntegrationTests.java create mode 100644 spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInMinutesIntegrationTests.java create mode 100644 spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInSecondsIntegrationTests.java diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java index 622c27ef7..7dd9c8c6f 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java @@ -17,6 +17,7 @@ import static org.springframework.data.gemfire.util.CollectionUtils.asSet; +import java.time.Duration; import java.util.Properties; import java.util.Set; @@ -40,6 +41,8 @@ import org.springframework.core.env.PropertySource; import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.geode.boot.autoconfigure.support.EnableSubscriptionConfiguration; +import org.springframework.lang.NonNull; +import org.springframework.lang.Nullable; import org.springframework.session.Session; import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession; import org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration; @@ -108,11 +111,13 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp if (isSet(environment, SPRING_SESSION_TIMEOUT_PROPERTY)) { springSessionProperties.setProperty(SPRING_SESSION_DATA_GEMFIRE_SESSION_EXPIRATION_TIMEOUT, - environment.getProperty(SPRING_SESSION_TIMEOUT_PROPERTY)); + toSecondsAsString(environment.getProperty(SPRING_SESSION_TIMEOUT_PROPERTY, Duration.class, + getDefaultSessionTimeout()))); } else if (isSet(environment, SERVER_SERVLET_SESSION_TIMEOUT_PROPERTY)) { springSessionProperties.setProperty(SPRING_SESSION_DATA_GEMFIRE_SESSION_EXPIRATION_TIMEOUT, - environment.getProperty(SERVER_SERVLET_SESSION_TIMEOUT_PROPERTY)); + toSecondsAsString(environment.getProperty(SERVER_SERVLET_SESSION_TIMEOUT_PROPERTY, + Duration.class, getDefaultSessionTimeout()))); } if (!springSessionProperties.isEmpty()) { @@ -127,6 +132,20 @@ private PropertySource newPropertySource(String name, Properties properties) } } + protected static @NonNull Duration getDefaultSessionTimeout() { + return Duration.ofSeconds(GemFireHttpSessionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL_IN_SECONDS); + } + + protected static int toSeconds(@Nullable Duration duration) { + + return duration != null ? Long.valueOf(duration.getSeconds()).intValue() + : GemFireHttpSessionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL_IN_SECONDS; + } + + protected static @NonNull String toSecondsAsString(@Nullable Duration duration) { + return String.valueOf(toSeconds(duration)); + } + protected static boolean isNotSet(ConfigurableEnvironment environment, String propertyName) { return !isSet(environment, propertyName); } diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java index 6deddb5c2..1e534d243 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java @@ -15,11 +15,13 @@ */ package org.springframework.geode.boot.autoconfigure.configuration; +import java.time.Duration; + import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientRegionShortcut; - import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; +import org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration; /** * Spring Boot {@link ConfigurationProperties} used to configure Spring Session for Apache Geode (SSDG) in order to @@ -190,6 +192,15 @@ public int getMaxInactiveIntervalSeconds() { public void setMaxInactiveIntervalSeconds(int maxInactiveIntervalSeconds) { this.maxInactiveIntervalSeconds = maxInactiveIntervalSeconds; } + + public void setMaxInactiveInterval(Duration duration) { + + int maxInactiveIntervalInSeconds = duration != null + ? Long.valueOf(duration.getSeconds()).intValue() + : GemFireHttpSessionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL_IN_SECONDS; + + setMaxInactiveIntervalSeconds(maxInactiveIntervalInSeconds); + } } public static class SessionRegionProperties { diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java index 4a8c7ef11..e2835a7ad 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java @@ -113,7 +113,7 @@ public void clientCacheConfigurationIsCorrect() { PdxSerializer pdxSerializer = this.clientCache.getPdxSerializer(); assertThat(pdxSerializer).isInstanceOf(PdxSerializerSessionSerializerAdapter.class); - assertThat(((PdxSerializerSessionSerializerAdapter) pdxSerializer).getSessionSerializer()) + assertThat(((PdxSerializerSessionSerializerAdapter) pdxSerializer).getSessionSerializer()) .isEqualTo(mockSessionSerializer); } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests.java new file mode 100644 index 000000000..80d6b5443 --- /dev/null +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests.java @@ -0,0 +1,78 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.springframework.geode.boot.autoconfigure.session; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.Test; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; +import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; +import org.springframework.session.Session; +import org.springframework.session.SessionRepository; +import org.springframework.session.data.gemfire.GemFireOperationsSessionRepository; +import org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration; + +/** + * Abstract base test class for {@link Session} {@literal} in the configured {@literal time unit}, + * for example: seconds, minutes, etc. + * + * @author John Blum + * @see org.junit.Test + * @see org.springframework.boot.autoconfigure.SpringBootApplication + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport + * @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects + * @see org.springframework.session.Session + * @see org.springframework.session.SessionRepository + * @see org.springframework.session.data.gemfire.GemFireOperationsSessionRepository + * @see org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration + * @since 2.0.0 + */ +@SuppressWarnings("unused") +public abstract class AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests extends IntegrationTestsSupport { + + @Autowired + private GemFireHttpSessionConfiguration configuration; + + @Autowired + private SessionRepository repository; + + protected int getExpectedMaxInactiveIntervalInSeconds() { + return GemFireHttpSessionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL_IN_SECONDS; + } + + @Test + public void sessionTimeoutConfigurationIsCorrect() { + + int expectedMaxInactiveIntervalInSeconds = getExpectedMaxInactiveIntervalInSeconds(); + + assertThat(this.configuration).isNotNull(); + assertThat(this.configuration.getMaxInactiveIntervalInSeconds()).isEqualTo(expectedMaxInactiveIntervalInSeconds); + assertThat(this.repository).isInstanceOf(GemFireOperationsSessionRepository.class); + + Session session = this.repository.createSession(); + + assertThat(session).isNotNull(); + assertThat(session.getMaxInactiveInterval().getSeconds()).isEqualTo(expectedMaxInactiveIntervalInSeconds); + } + + @SpringBootApplication + @EnableGemFireMockObjects + static class TestConfiguration { } + +} diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java index f7817edda..407acc1f9 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java @@ -109,7 +109,7 @@ private static Properties singletonProperties(String propertyName, String proper private Function newSpringBootSessionPropertiesConfigurationFunction() { return springApplicationBuilder -> - springApplicationBuilder.properties(singletonProperties("spring.session.timeout", "300")); + springApplicationBuilder.properties(singletonProperties("spring.session.timeout", "300s")); } private Function newSpringSessionGemFirePropertiesConfigurationFunction() { @@ -134,7 +134,7 @@ private Function private Function newWebServerSessionPropertiesConfigurationFunction() { return springApplicationBuilder -> - springApplicationBuilder.properties(singletonProperties("server.servlet.session.timeout", "3600")); + springApplicationBuilder.properties(singletonProperties("server.servlet.session.timeout", "3600s")); } @Override @@ -259,10 +259,10 @@ public void springSessionExpirationTimeoutConfiguredWithWebContainerProperties() .isEqualTo(3600); } + //@SpringBootApplication @SpringBootConfiguration @EnableAutoConfiguration @EnableGemFireMockObjects - //@SpringBootApplication static class TestConfiguration { @Bean("MockSessionSerializer") diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java index df95020c2..2ba4daa78 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java @@ -17,6 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import java.time.Duration; import java.util.concurrent.TimeUnit; import javax.annotation.Resource; @@ -62,9 +63,10 @@ */ @RunWith(SpringRunner.class) @SpringBootTest( + classes = SessionExpirationIntegrationTests.TestConfiguration.class, properties = { "spring.session.data.gemfire.cache.client.region.shortcut=LOCAL", - "spring.session.timeout=1", + "spring.session.timeout=1s", }, webEnvironment = SpringBootTest.WebEnvironment.MOCK ) @@ -98,6 +100,7 @@ public void sessionExpirationIsCorrect() { assertThat(session).isNotNull(); assertThat(session.getId()).isNotBlank(); assertThat(session.isExpired()).isFalse(); + assertThat(session.getMaxInactiveInterval()).isEqualTo(Duration.ofSeconds(1)); this.sessionRepository.save(session); diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInDaysIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInDaysIntegrationTests.java new file mode 100644 index 000000000..fdbfff5ad --- /dev/null +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInDaysIntegrationTests.java @@ -0,0 +1,49 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.springframework.geode.boot.autoconfigure.session; + +import java.time.Duration; + +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.session.Session; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * Integration Tests for {@link Session} {@literal expiration timeout} in {@literal days}. + * + * @author John Blum + * @see java.time.Duration + * @see org.springframework.boot.test.context.SpringBootTest + * @see org.springframework.geode.boot.autoconfigure.session.AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests + * @see org.springframework.session.Session + * @see org.springframework.test.context.junit4.SpringRunner + * @since 2.0.0 + */ +@RunWith(SpringRunner.class) +@SpringBootTest( + classes = AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests.TestConfiguration.class, + properties = "spring.session.timeout=5d", + webEnvironment = SpringBootTest.WebEnvironment.MOCK +) +public class SessionExpirationTimeoutInDaysIntegrationTests + extends AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests { + + @Override + protected int getExpectedMaxInactiveIntervalInSeconds() { + return Long.valueOf(Duration.ofDays(5).getSeconds()).intValue(); + } +} diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInHoursIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInHoursIntegrationTests.java new file mode 100644 index 000000000..14b757846 --- /dev/null +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInHoursIntegrationTests.java @@ -0,0 +1,49 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.springframework.geode.boot.autoconfigure.session; + +import java.time.Duration; + +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.session.Session; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * Integration Tests for {@link Session} {@literal expiration timeout} in {@literal hours}. + * + * @author John Blum + * @see java.time.Duration + * @see org.springframework.boot.test.context.SpringBootTest + * @see org.springframework.geode.boot.autoconfigure.session.AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests + * @see org.springframework.session.Session + * @see org.springframework.test.context.junit4.SpringRunner + * @since 2.0.0 + */ +@RunWith(SpringRunner.class) +@SpringBootTest( + classes = AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests.TestConfiguration.class, + properties = "spring.session.timeout=2h", + webEnvironment = SpringBootTest.WebEnvironment.MOCK +) +public class SessionExpirationTimeoutInHoursIntegrationTests + extends AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests{ + + @Override + protected int getExpectedMaxInactiveIntervalInSeconds() { + return Long.valueOf(Duration.ofHours(2).getSeconds()).intValue(); + } +} diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInMillisecondsIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInMillisecondsIntegrationTests.java new file mode 100644 index 000000000..e3be8d657 --- /dev/null +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInMillisecondsIntegrationTests.java @@ -0,0 +1,53 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.springframework.geode.boot.autoconfigure.session; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.Duration; + +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.session.Session; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * Integration Tests for {@link Session} {@literal expiration timeout} in {@literal milliseconds}. + * + * @author John Blum + * @see java.time.Duration + * @see org.springframework.boot.test.context.SpringBootTest + * @see org.springframework.geode.boot.autoconfigure.session.AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests + * @see org.springframework.session.Session + * @see org.springframework.test.context.junit4.SpringRunner + * @since 2.0.0 + */ +@RunWith(SpringRunner.class) +@SpringBootTest( + classes = AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests.TestConfiguration.class, + properties = "spring.session.timeout=250ms", + webEnvironment = SpringBootTest.WebEnvironment.MOCK +) +public class SessionExpirationTimeoutInMillisecondsIntegrationTests + extends AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests { + + @Override + protected int getExpectedMaxInactiveIntervalInSeconds() { + int maxInactiveIntervalInSeconds = Long.valueOf(Duration.ofMillis(250).getSeconds()).intValue(); + assertThat(maxInactiveIntervalInSeconds).isZero(); + return maxInactiveIntervalInSeconds; + } +} diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInMinutesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInMinutesIntegrationTests.java new file mode 100644 index 000000000..472bfd195 --- /dev/null +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInMinutesIntegrationTests.java @@ -0,0 +1,49 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.springframework.geode.boot.autoconfigure.session; + +import java.time.Duration; + +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.session.Session; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * Integration Tests for {@link Session} {@literal expiration timeout} in {@literal minutes}. + * + * @author John Blum + * @see java.time.Duration + * @see org.springframework.boot.test.context.SpringBootTest + * @see org.springframework.geode.boot.autoconfigure.session.AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests + * @see org.springframework.session.Session + * @see org.springframework.test.context.junit4.SpringRunner + * @since 2.0.0 + */ +@RunWith(SpringRunner.class) +@SpringBootTest( + classes = AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests.TestConfiguration.class, + properties = "spring.session.timeout=5m", + webEnvironment = SpringBootTest.WebEnvironment.MOCK +) +public class SessionExpirationTimeoutInMinutesIntegrationTests + extends AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests { + + @Override + protected int getExpectedMaxInactiveIntervalInSeconds() { + return Long.valueOf(Duration.ofMinutes(5).getSeconds()).intValue(); + } +} diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInSecondsIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInSecondsIntegrationTests.java new file mode 100644 index 000000000..481578d1d --- /dev/null +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationTimeoutInSecondsIntegrationTests.java @@ -0,0 +1,49 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.springframework.geode.boot.autoconfigure.session; + +import java.time.Duration; + +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.session.Session; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * Integration Tests for {@link Session} {@literal expiration timeout} in {@literal seconds}. + * + * @author John Blum + * @see java.time.Duration + * @see org.springframework.boot.test.context.SpringBootTest + * @see org.springframework.geode.boot.autoconfigure.session.AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests + * @see org.springframework.session.Session + * @see org.springframework.test.context.junit4.SpringRunner + * @since 2.0.0 + */ +@RunWith(SpringRunner.class) +@SpringBootTest( + classes = AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests.TestConfiguration.class, + properties = "spring.session.timeout=600s", + webEnvironment = SpringBootTest.WebEnvironment.MOCK +) +public class SessionExpirationTimeoutInSecondsIntegrationTests + extends AbstractSessionExpirationTimeoutInTimeUnitIntegrationTests { + + @Override + protected int getExpectedMaxInactiveIntervalInSeconds() { + return Long.valueOf(Duration.ofSeconds(600).getSeconds()).intValue(); + } +} From eff1c3a39c49fdeb5bee066c8f492e8a97e98adf Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 2 Mar 2022 21:30:47 -0800 Subject: [PATCH 023/201] Add documentation on dependency version overriding. Resolves gh-114. --- .../src/docs/asciidoc/index.adoc | 182 ++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/spring-geode-docs/src/docs/asciidoc/index.adoc b/spring-geode-docs/src/docs/asciidoc/index.adoc index c7be3e2e1..1b5a6ab94 100644 --- a/spring-geode-docs/src/docs/asciidoc/index.adoc +++ b/spring-geode-docs/src/docs/asciidoc/index.adoc @@ -569,6 +569,188 @@ dependencyManagement { All of this is made simple by going to https://start.spring.io[start.spring.io] and creating a Spring Boot `{spring-boot-version}` project using {apache-geode-name}. +[[sbdg-dependency-version-overrides]] +=== Overriding Dependency Versions + +While Spring Boot for {apache-geode-name} requires baseline versions of the <> +outlined above, it is possible, using Spring Boot's dependency management functionality, to override the versions of +3rd-party dependencies (Java libraries) managed by Spring Boot itself. + +When your Spring Boot application Maven POM inherits from the `org.springframework.boot:spring-boot-starter-parent`, +or alternatively, applies the Spring Dependency Management Gradle Plugin (`io.spring.dependency-management`) +in addition to the Spring Boot Gradle Plugin (`org.springframework.boot`) in your Spring Boot application Gradle +build file, then you automatically enable the dependency management capabilities provided by Spring Boot for all +3rd-party dependencies and Java libraries curated and managed by Spring Boot. + +Spring Boot's dependency management harmonizes all 3rd-party Java libraries and dependencies that you, the user, +are likely to use in your Spring Boot applications. All of these curated dependencies have been tested and proven to +work with the version of Spring Boot along with all other Spring dependencies (e.g. Spring Data, Spring Security) +that you may also be using in your Spring Boot applications. + +Still, there may be times when you want, or even need to override the version of some 3rd-party Java libraries used by +your Spring Boot applications, that are specifically managed by Spring Boot. In cases where you know that using a +different version of a managed dependency is safe to do so, then you have a few options for how to override +the dependency version: + +* <> +* <> + +TIP: You should refer to Spring Boot's documentation on +{spring-boot-docs-html}/using.html#using.build-systems.dependency-management[Dependency Management] for more details. + +[[sbdg-dependency-version-overrides-property]] +==== Version Property Override + +Perhaps the easiest option to change the version of a Spring Boot managed dependency is to set the version property +used by Spring Boot to control the dependency's version to the desired Java library version. + +For example, if you want to use a different version of **Log4j** than what is currently set and determined by +Spring Boot, then you would do: + +.Maven dependency version property override +[source.java] +---- + + 2.17.2 + +---- + +.Gradle dependency version property override +---- +ext['log4j2.version'] = '2.17.2' +---- + +NOTE: The Log4j version number used in the Maven and Gradle examples shown above is arbitrary. You must set +the `log4j2.version` property to a valid Log4j version that would be resolvable by Maven or Gradle, +given the fully qualified artifact: `org.apache.logging.log4j:log4j:2.17.2`. + +The version property name must precisely match the version property declared in the `spring-boot-dependencies` +Maven POM. + +ifeval::["{version-snapshot}" == "true"] +See the https://repo.spring.io/snapshot/org/springframework/boot/spring-boot-dependencies/{spring-boot-version}/spring-boot-dependencies-{spring-boot-version}.pom[spring-boot-dependencies POM] +containing version properties for all the dependencies managed by Spring Boot. +endif::[] + +ifeval::["{version-milestone}" == "true"] +See the https://repo.spring.io/milestone/org/springframework/boot/spring-boot-dependencies/{spring-boot-version}/spring-boot-dependencies-{spring-boot-version}.pom[spring-boot-dependencies POM] +containing version properties for all the dependencies managed by Spring Boot. +endif::[] + +ifeval::["{version-release}" == "true"] +See the https://repo.spring.io/artifactory/milestone/org/springframework/boot/spring-boot-dependencies/{spring-boot-version}/spring-boot-dependencies-{spring-boot-version}.pom[spring-boot-dependencies POM] +containing version properties for all the dependencies managed by Spring Boot. +endif::[] + +More details can be found in the Spring Boot Maven Plugin +https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/#using.parent-pom[documentation] +as well as the Spring Boot Gradle Plugin +https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#managing-dependencies[documentation]. + +[[sbdg-dependency-version-overrides-dependencymanagement]] +==== Override with Dependency Management + +This option is not specific to Spring in general, or Spring Boot in particular, but applies to Maven and Gradle, +which both intrinsically have dependency management features and capabilities. + +This approach is useful not only to control the versions of the dependencies managed by Spring Boot directly, but also +to control the versions of dependencies that may be transitively pulled in by the dependencies that are managed by +Spring Boot. Additionally, this approach is also more universally transferrable since it is handled by Maven or Gradle +itself. + +For example, when you declare the `org.springframework.boot:spring-boot-starter-test` dependency in your Spring Boot +application Maven POM or Gradle build file for testing purposes, you will see a dependency tree similar to: + +.$gradlew dependencies OR $mvn dependency:tree +[source,xml] +---- +... +[INFO] +- org.springframework.boot:spring-boot-starter-test:jar:2.6.4:test +[INFO] | +- org.springframework.boot:spring-boot-test:jar:2.6.4:test +[INFO] | +- org.springframework.boot:spring-boot-test-autoconfigure:jar:2.6.4:test +[INFO] | +- com.jayway.jsonpath:json-path:jar:2.6.0:test +[INFO] | | +- net.minidev:json-smart:jar:2.4.8:test +[INFO] | | | \- net.minidev:accessors-smart:jar:2.4.8:test +[INFO] | | | \- org.ow2.asm:asm:jar:9.1:test +[INFO] | | \- org.slf4j:slf4j-api:jar:1.7.36:compile +[INFO] | +- jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3:test +[INFO] | | \- jakarta.activation:jakarta.activation-api:jar:1.2.2:test +[INFO] | +- org.assertj:assertj-core:jar:3.21.0:compile +[INFO] | +- org.hamcrest:hamcrest:jar:2.2:compile +[INFO] | +- org.junit.jupiter:junit-jupiter:jar:5.8.2:test +[INFO] | | +- org.junit.jupiter:junit-jupiter-api:jar:5.8.2:test +[INFO] | | | +- org.opentest4j:opentest4j:jar:1.2.0:test +[INFO] | | | +- org.junit.platform:junit-platform-commons:jar:1.8.2:test +[INFO] | | | \- org.apiguardian:apiguardian-api:jar:1.1.2:test +[INFO] | | +- org.junit.jupiter:junit-jupiter-params:jar:5.8.2:test +[INFO] | | \- org.junit.jupiter:junit-jupiter-engine:jar:5.8.2:test +[INFO] | | \- org.junit.platform:junit-platform-engine:jar:1.8.2:test +... +---- + +If you wanted to override and control the version of the `opentest4j` transitive dependency, for whatever reason, +perhapsbecause you are using the `opentest4j` API directly in your application tests, then you could add dependency +management in either Maven or Gradle to control the `opentest4j` dependency version. + +Note that the `opentest4j` dependency is pulled in by JUnit and is not a dependency that Spring Boot specifically +manages. Of course, Maven or Gradle's dependency management capabilities can be used to override dependencies that are +managed by Spring Boot, too. + +Using the `opentest4j` dependency as an example, you can override the dependency version by doing the following: + +.Maven dependency version override +[source,xml] +---- + + + + + + org.opentest4j + opentest4j + 1.0.0 + + + + + +---- + +.Gradle dependency version override +[source,grooy] +[subs="verbatim,attributes"] +---- +plugins { + id 'org.springframework.boot' version '{spring-boot-version}' +} + +apply plugin: 'io.spring.dependency-management' + +dependencyManagement { + dependencies { + dependency 'org.opentest4j:openttest4j:1.0.0' + } +} +---- + +After applying Maven or Gradle dependency management configuration, you will then see: + +.$gradlew dependencies OR $mvn dependency:tree +[source,xml] +---- +... +[INFO] +- org.springframework.boot:spring-boot-starter-test:jar:2.6.4:test +... +[INFO] | | | +- org.opentest4j:opentest4j:jar:1.0.0:test +... +---- + +For more details on Maven dependency management, refer to +the https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html[documentation]. + +For more details on Gradle dependency management, please refer to +the https://docs.gradle.org/current/userguide/core_dependency_management.html[documentation] + include::{include-dir}/clientcache-applications.adoc[] include::{include-dir}/configuration-auto.adoc[] From 281b6fa08f047b8e3e7024c307d5a6d8b376eb6e Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 11 Mar 2022 12:03:10 -0800 Subject: [PATCH 024/201] Add warning about overriding Spring Boot managed dependency versions. Additionally, edit the sub-chapter (section) on dependency version overriding. --- .../src/docs/asciidoc/index.adoc | 70 +++++++++---------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/spring-geode-docs/src/docs/asciidoc/index.adoc b/spring-geode-docs/src/docs/asciidoc/index.adoc index 1b5a6ab94..a70166562 100644 --- a/spring-geode-docs/src/docs/asciidoc/index.adoc +++ b/spring-geode-docs/src/docs/asciidoc/index.adoc @@ -573,25 +573,33 @@ All of this is made simple by going to https://start.spring.io[start.spring.io] === Overriding Dependency Versions While Spring Boot for {apache-geode-name} requires baseline versions of the <> -outlined above, it is possible, using Spring Boot's dependency management functionality, to override the versions of -3rd-party dependencies (Java libraries) managed by Spring Boot itself. +listed above, it is possible, using Spring Boot's dependency management capabilities, to override the versions of +3rd-party Java libraries and dependencies managed by Spring Boot itself. When your Spring Boot application Maven POM inherits from the `org.springframework.boot:spring-boot-starter-parent`, -or alternatively, applies the Spring Dependency Management Gradle Plugin (`io.spring.dependency-management`) -in addition to the Spring Boot Gradle Plugin (`org.springframework.boot`) in your Spring Boot application Gradle -build file, then you automatically enable the dependency management capabilities provided by Spring Boot for all -3rd-party dependencies and Java libraries curated and managed by Spring Boot. +or alternatively, applies the Spring Dependency Management Gradle Plugin (`io.spring.dependency-management`) along with +the Spring Boot Gradle Plugin (`org.springframework.boot`) in your Spring Boot application Gradle build file, then you +automatically enable the dependency management capabilities provided by Spring Boot for all 3rd-party Java libraries +and dependencies curated and managed by Spring Boot. -Spring Boot's dependency management harmonizes all 3rd-party Java libraries and dependencies that you, the user, -are likely to use in your Spring Boot applications. All of these curated dependencies have been tested and proven to -work with the version of Spring Boot along with all other Spring dependencies (e.g. Spring Data, Spring Security) -that you may also be using in your Spring Boot applications. +Spring Boot's dependency management harmonizes all 3rd-party Java libraries and dependencies that you are likely to use +in your Spring Boot applications. All these dependencies have been tested and proven to work with the version of Spring +Boot and other Spring dependencies (e.g. Spring Data, Spring Security) you may be using in your Spring Boot applications. Still, there may be times when you want, or even need to override the version of some 3rd-party Java libraries used by your Spring Boot applications, that are specifically managed by Spring Boot. In cases where you know that using a different version of a managed dependency is safe to do so, then you have a few options for how to override the dependency version: +WARNING: Use caution when overriding dependencies since they may not be compatible with other dependencies managed by +Spring Boot for which you may have declared on your application classpath, for example, by adding a starter. It is +common for multiple Java libraries to share the same transitive dependencies but use different versions of the Java +library (e.g. logging). This will often lead to Exceptions thrown at runtime due to API differences. Keep in mind that +Java resolves classes on the classpath from the first class definition that is found in the order that JARs or paths +have been defined on the classpath. Finally, Spring does not support dependency versions that have been overridden +and do not match the versions declared and managed by Spring Boot. +See {spring-boot-docs-html}/#appendix.dependency-versions.coordinates[documentation]. + * <> * <> @@ -621,28 +629,15 @@ ext['log4j2.version'] = '2.17.2' ---- NOTE: The Log4j version number used in the Maven and Gradle examples shown above is arbitrary. You must set -the `log4j2.version` property to a valid Log4j version that would be resolvable by Maven or Gradle, -given the fully qualified artifact: `org.apache.logging.log4j:log4j:2.17.2`. +the `log4j2.version` property to a valid Log4j version that would be resolvable by Maven or Gradle when given +the fully qualified artifact: `org.apache.logging.log4j:log4j:2.17.2`. The version property name must precisely match the version property declared in the `spring-boot-dependencies` Maven POM. -ifeval::["{version-snapshot}" == "true"] -See the https://repo.spring.io/snapshot/org/springframework/boot/spring-boot-dependencies/{spring-boot-version}/spring-boot-dependencies-{spring-boot-version}.pom[spring-boot-dependencies POM] -containing version properties for all the dependencies managed by Spring Boot. -endif::[] - -ifeval::["{version-milestone}" == "true"] -See the https://repo.spring.io/milestone/org/springframework/boot/spring-boot-dependencies/{spring-boot-version}/spring-boot-dependencies-{spring-boot-version}.pom[spring-boot-dependencies POM] -containing version properties for all the dependencies managed by Spring Boot. -endif::[] - -ifeval::["{version-release}" == "true"] -See the https://repo.spring.io/artifactory/milestone/org/springframework/boot/spring-boot-dependencies/{spring-boot-version}/spring-boot-dependencies-{spring-boot-version}.pom[spring-boot-dependencies POM] -containing version properties for all the dependencies managed by Spring Boot. -endif::[] +See Spring Boot's documentation on {spring-boot-docs-html}/#appendix.dependency-versions.properties[version properties]. -More details can be found in the Spring Boot Maven Plugin +Additional details can be found in the Spring Boot Maven Plugin https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/#using.parent-pom[documentation] as well as the Spring Boot Gradle Plugin https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#managing-dependencies[documentation]. @@ -651,17 +646,16 @@ https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsing ==== Override with Dependency Management This option is not specific to Spring in general, or Spring Boot in particular, but applies to Maven and Gradle, -which both intrinsically have dependency management features and capabilities. +which both have intrinsic dependency management features and capabilities. -This approach is useful not only to control the versions of the dependencies managed by Spring Boot directly, but also -to control the versions of dependencies that may be transitively pulled in by the dependencies that are managed by -Spring Boot. Additionally, this approach is also more universally transferrable since it is handled by Maven or Gradle -itself. +This approach is useful to not only control the versions of the dependencies managed by Spring Boot directly, but also +control the versions of dependencies that may be transitively pulled in by the dependencies that are managed by +Spring Boot. Additionally, this approach is more universal since it is handled by Maven or Gradle itself. For example, when you declare the `org.springframework.boot:spring-boot-starter-test` dependency in your Spring Boot application Maven POM or Gradle build file for testing purposes, you will see a dependency tree similar to: -.$gradlew dependencies OR $mvn dependency:tree +.`$gradlew dependencies` OR `$mvn dependency:tree` [source,xml] ---- ... @@ -689,12 +683,12 @@ application Maven POM or Gradle build file for testing purposes, you will see a ---- If you wanted to override and control the version of the `opentest4j` transitive dependency, for whatever reason, -perhapsbecause you are using the `opentest4j` API directly in your application tests, then you could add dependency +perhaps because you are using the `opentest4j` API directly in your application tests, then you could add dependency management in either Maven or Gradle to control the `opentest4j` dependency version. -Note that the `opentest4j` dependency is pulled in by JUnit and is not a dependency that Spring Boot specifically -manages. Of course, Maven or Gradle's dependency management capabilities can be used to override dependencies that are -managed by Spring Boot, too. +NOTE: The `opentest4j` dependency is pulled in by JUnit and is not a dependency that Spring Boot specifically manages. +Of course, Maven or Gradle's dependency management capabilities can be used to override dependencies that are managed +by Spring Boot as well. Using the `opentest4j` dependency as an example, you can override the dependency version by doing the following: @@ -735,7 +729,7 @@ dependencyManagement { After applying Maven or Gradle dependency management configuration, you will then see: -.$gradlew dependencies OR $mvn dependency:tree +.`$gradlew dependencies` OR `$mvn dependency:tree` [source,xml] ---- ... From 808151b89815a86d3cc33b83af37081e58414bf2 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 11 Mar 2022 11:28:43 -0800 Subject: [PATCH 025/201] Add the Java (JRE) version to the list of primary dependency versions. --- spring-geode-docs/spring-geode-docs.gradle | 2 ++ spring-geode-docs/src/docs/asciidoc/index.adoc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/spring-geode-docs/spring-geode-docs.gradle b/spring-geode-docs/spring-geode-docs.gradle index df1a3f406..84ece65d8 100644 --- a/spring-geode-docs/spring-geode-docs.gradle +++ b/spring-geode-docs/spring-geode-docs.gradle @@ -42,6 +42,7 @@ asciidoctor { asciidoctorj { + def javaVersion = JavaVersion.current() def apacheGeodeDocVersion = resolveApacheGeodeDocVersion("${apacheGeodeVersion}") def githubBaseUrl = "https://github.com/spring-projects/spring-boot-data-geode" def githubTag = snapshotBuild ? 'master' : project.version @@ -56,6 +57,7 @@ asciidoctorj { 'github-samples-url': "${githubUrl}/spring-geode-samples", 'highlightjsdir@': "js/highlight", 'docinfodir@': ".", + 'java-version' : "$javaVersion", 'apache-geode-artifact-version' : "${apacheGeodeVersion}", 'apache-geode-doc-version' : apacheGeodeDocVersion, 'apache-geode-src' : "https://github.com/apache/geode/blob/rel/v${apacheGeodeVersion}", diff --git a/spring-geode-docs/src/docs/asciidoc/index.adoc b/spring-geode-docs/src/docs/asciidoc/index.adoc index a70166562..4166f06c6 100644 --- a/spring-geode-docs/src/docs/asciidoc/index.adoc +++ b/spring-geode-docs/src/docs/asciidoc/index.adoc @@ -459,6 +459,8 @@ listed below: |=== | Name | Version +| Java (JRE) | {java-version} + | {apache-geode-name} | {apache-geode-version} | Spring Framework | {spring-version} From 59cfcdb3910e527603fc32f5350e024073a29b14 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 8 Mar 2022 13:05:29 -0800 Subject: [PATCH 026/201] Upgrade to Awaitility 4.2.0. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c837d5361..1e2855638 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 deployDocsHost=docs-ip.spring.io antlrVersion=2.7.7 apacheGeodeVersion=1.14.3 -awaitilityVersion=4.1.1 +awaitilityVersion=4.2.0 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.3 From 0db92d102e8b87afd8a03ef9de8fc1de9d5b39bd Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 16 Mar 2022 09:09:26 -0700 Subject: [PATCH 027/201] Set Spring Geode Samples parent Maven POM to Spring Boot 2.7.0-SNAPSHOT. --- spring-geode-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index ea5380b91..8df1f8459 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.0-M2 + 2.7.0-SNAPSHOT From f52886ac1c287fd90f453c473221fb9c92113fe4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 16 Mar 2022 10:08:17 -0700 Subject: [PATCH 028/201] Change source XML blocks to source TEXT blocks in index.adoc. --- spring-geode-docs/src/docs/asciidoc/index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-geode-docs/src/docs/asciidoc/index.adoc b/spring-geode-docs/src/docs/asciidoc/index.adoc index 4166f06c6..314082f2d 100644 --- a/spring-geode-docs/src/docs/asciidoc/index.adoc +++ b/spring-geode-docs/src/docs/asciidoc/index.adoc @@ -658,7 +658,7 @@ For example, when you declare the `org.springframework.boot:spring-boot-starter- application Maven POM or Gradle build file for testing purposes, you will see a dependency tree similar to: .`$gradlew dependencies` OR `$mvn dependency:tree` -[source,xml] +[source,text] ---- ... [INFO] +- org.springframework.boot:spring-boot-starter-test:jar:2.6.4:test @@ -732,7 +732,7 @@ dependencyManagement { After applying Maven or Gradle dependency management configuration, you will then see: .`$gradlew dependencies` OR `$mvn dependency:tree` -[source,xml] +[source,text] ---- ... [INFO] +- org.springframework.boot:spring-boot-starter-test:jar:2.6.4:test From e7d223bf28fbcf80e649d1d16523cd6ae7b25a79 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:15:18 -0700 Subject: [PATCH 029/201] Edit changelog and include 1.5.11 release notes. --- spring-geode/src/main/resources/changelog.txt | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 1c8974579..cd4e91a5e 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,26 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.5.11 (2022-03-24) +------------------------------------- +Aligns SBDG with Spring Boot 2.5.11. + +* Adds documentation on the Java version. +* Adds documentation on dependency version overriding complimenting Spring Boots documentation. +* Fixes bug involving the spring.session.timeout Spring Boot property. +Resolves GitHub Issue #113: https://github.com/spring-projects/spring-boot-data-geode/issues/113. +* Upgrades to Apache Geode 1.13.8. +* Upgrades to Awaitility 4.2.0. +* Upgrades to Spring Framework 5.3.17. +* Upgrades to Spring Boot 2.5.11. +* Upgrades to Spring Data BOM 2021.0.10 (Pascal-SR10). +* Upgrades to Spring Data for Apache Geode 2.5.10. +* Upgrades to Spring Session for Apache Geode 2.5.6. +* Upgrades to Spring Test for Apache Geode 0.1.2-PASCAL. +* Upgrades to VMware Tanzu (Pivotal) GemFire 9.10.15. +* Upgrades to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.13.7. + + Changes in version 1.7.0-M2 (2022-02-28) ---------------------------------------- Aligns SBDG with Spring Boot 2.7.0-M2. From 6dc1f12f849106213e50bf1ae3affcafe402cb02 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:15:51 -0700 Subject: [PATCH 030/201] Edit README to refer to 1.5.11 release and 1.5.12-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 9f867ca4a..fd4e456fc 100644 --- a/README.adoc +++ b/README.adoc @@ -77,8 +77,8 @@ The following SBDG versions are currently maintained and developed. | `1.7.0-M2`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.5-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.4`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] -| `1.5.11-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.5.10`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] +| `1.5.12-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.5.11`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] |=== From cedb9af72c7cfa0db90932ce95ba773f36f3b086 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:16:46 -0700 Subject: [PATCH 031/201] Edit changelog and include 1.6.5 release notes. --- spring-geode/src/main/resources/changelog.txt | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index cd4e91a5e..9e93c147f 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,26 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.5 (2022-03-24) +------------------------------------- +Aligns SBDG with Spring Boot 2.6.5. + +* Adds documentation on the Java version. +* Adds documentation on dependency version overriding complimenting Spring Boot's documentation. +* Fixes bug involving the spring.session.timeout Spring Boot property. +Resolves GitHub Issue #113: https://github.com/spring-projects/spring-boot-data-geode/issues/113. +* Upgrades to Apache Geode 1.14.4. +* Upgrades to Awaitility 4.2.0. +* Upgrades to Spring Framework 5.3.17. +* Upgrades to Spring Boot 2.6.5. +* Upgrades to Spring Data BOM 2021.1.3 (Q-SR3). +* Upgrades to Spring Data for Apache Geode 2.6.3 +* Upgrades to Spring Session for Apache Geode 2.6.1. +* Upgrades to Spring Test for Apache Geode 0.2.2-Q. +* Upgrades to VMware Tanzu (Pivotal) GemFire 9.10.15. +* Upgrades to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.14.4. + + Changes in version 1.5.11 (2022-03-24) ------------------------------------- Aligns SBDG with Spring Boot 2.5.11. From 0da6af19f16c7c621a912d3b092d6c0122b7db2a Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:17:38 -0700 Subject: [PATCH 032/201] Edit README to refer to 1.6.5 release and 1.6.6-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index fd4e456fc..aefa00c0a 100644 --- a/README.adoc +++ b/README.adoc @@ -75,8 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.0-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.0-M2`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.5-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.4`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] +| `1.6.6-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.5`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] | `1.5.12-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.5.11`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] From 28331b41014d8696e241c4e8c9899eadf346ce2d Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:18:50 -0700 Subject: [PATCH 033/201] Upgrade to Apache Geode 1.14.4. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1e2855638..fdd22d132 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 deployDocsHost=docs-ip.spring.io antlrVersion=2.7.7 -apacheGeodeVersion=1.14.3 +apacheGeodeVersion=1.14.4 awaitilityVersion=4.2.0 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 From 5091d053f8add167c0a0d5eba5045d9f2c1d345e Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:19:31 -0700 Subject: [PATCH 034/201] Upgrade to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.14.4. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fdd22d132..715292eb1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ apacheGeodeVersion=1.14.4 awaitilityVersion=4.2.0 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 -pivotalCloudCacheVersion=1.14.3 +pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.14 springVersion=5.3.16 springBootVersion=2.7.0-SNAPSHOT From 0bb92d62e50636c95bcd720ea8e5cd659ecd46d6 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:20:06 -0700 Subject: [PATCH 035/201] Upgrade to VMware Tanzu (Pivotal) GemFire 9.10.15. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 715292eb1..b568bf68f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ awaitilityVersion=4.2.0 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 -pivotalGemFireVersion=9.10.14 +pivotalGemFireVersion=9.10.15 springVersion=5.3.16 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 From 19b29b571161327becf3bf283bc19786f3b67a5c Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:21:18 -0700 Subject: [PATCH 036/201] Upgrade to Spring Framework 5.3.17. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b568bf68f..7735f0f13 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 -springVersion=5.3.16 +springVersion=5.3.17 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M3 From 92e6074c752cec33fb00a5167f6c538e69e3b76b Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:21:40 -0700 Subject: [PATCH 037/201] Upgrade to Spring Boot 2.7.0-M3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7735f0f13..395b927cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 springVersion=5.3.17 -springBootVersion=2.7.0-SNAPSHOT +springBootVersion=2.7.0-M3 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M3 springDataGeodeVersion=2.7.0-M3 From a91be8539e7e82c764916ec33261b2b36b75af34 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:22:58 -0700 Subject: [PATCH 038/201] Upgrade to Spring Data BOM 2021.2.0-M4 (Raj-M4). --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 395b927cb..70eaf5b04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.15 springVersion=5.3.17 springBootVersion=2.7.0-M3 springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.0-M3 +springDataBomVersion=2021.2.0-M4 springDataGeodeVersion=2.7.0-M3 springDataGeodeTestVersion=0.3.0-RAJ-M2 springSessionBomVersion=2021.2.0-M1 From 9aa6504e2cb358ec2fade178a81bb05b4956b938 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:23:54 -0700 Subject: [PATCH 039/201] Upgrade to Spring Data for Apache Geode 2.7.0-M4. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 70eaf5b04..68b520576 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.17 springBootVersion=2.7.0-M3 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M4 -springDataGeodeVersion=2.7.0-M3 +springDataGeodeVersion=2.7.0-M4 springDataGeodeTestVersion=0.3.0-RAJ-M2 springSessionBomVersion=2021.2.0-M1 springSessionDataGeodeVersion=2.7.0-M1 From 1c311e4e069ce67b40c4d251931d4c786c6a7af8 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:24:30 -0700 Subject: [PATCH 040/201] Upgrade to Spring Test for Apache Geode 0.3.0-RAJ-M3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 68b520576..04123b609 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ springBootVersion=2.7.0-M3 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M4 springDataGeodeVersion=2.7.0-M4 -springDataGeodeTestVersion=0.3.0-RAJ-M2 +springDataGeodeTestVersion=0.3.0-RAJ-M3 springSessionBomVersion=2021.2.0-M1 springSessionDataGeodeVersion=2.7.0-M1 springShellVersion=1.2.0.RELEASE From 83824cb113ee0e6a28a50e2d51ac569c81f18ebc Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:25:22 -0700 Subject: [PATCH 041/201] Upgrade to Spring Session for Apache Geode 2.7.0-M2. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 04123b609..6c90fefde 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ springDataBomVersion=2021.2.0-M4 springDataGeodeVersion=2.7.0-M4 springDataGeodeTestVersion=0.3.0-RAJ-M3 springSessionBomVersion=2021.2.0-M1 -springSessionDataGeodeVersion=2.7.0-M1 +springSessionDataGeodeVersion=2.7.0-M2 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 version=1.7.0-SNAPSHOT From f47bb082f309bb3ae661dfce3199393dae16852f Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:26:34 -0700 Subject: [PATCH 042/201] Refactor the Gradle Project Maven POM generation. Edit the developer email address. --- gradle/maven-pom-editor.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/maven-pom-editor.gradle b/gradle/maven-pom-editor.gradle index 2cae4230a..0d8d9cb33 100644 --- a/gradle/maven-pom-editor.gradle +++ b/gradle/maven-pom-editor.gradle @@ -7,7 +7,7 @@ def customizePom(gradleProject, pom) { developer { id = 'jxblum' name = "John Blum" - email = "jblum@pivotal.io" + email = "info@vmware.com" } } scm { From 310cab493623c7bdc43fa7349c393c013ffae2bb Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:38:29 -0700 Subject: [PATCH 043/201] Upgrade the Spring Geode Sample parent Maven POM to Spring Boot 2.7.0-M3. --- spring-geode-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index 8df1f8459..7234b45a7 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.0-SNAPSHOT + 2.7.0-M3 From d01219ffa92ca853bbab31c2b30c2840d490c154 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:44:14 -0700 Subject: [PATCH 044/201] Edit changelog and add 1.7.0-M3 release notes. --- spring-geode/src/main/resources/changelog.txt | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 9e93c147f..67439df0b 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,26 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.7.0-M3 (2022-03-24) +---------------------------------------- +Aligns SBDG with Spring Boot 2.7.0-M3. + +* Adds documentation on the Java version. +* Adds documentation on dependency version overriding complimenting Spring Boot's documentation. +* Fixes bug involving the spring.session.timeout Spring Boot property. +Resolves GitHub Issue #113: https://github.com/spring-projects/spring-boot-data-geode/issues/113. +* Upgrades to Apache Geode 1.14.4. +* Upgrades to Awaitility 4.2.0. +* Upgrades to VMware Tanzu (Pivotal) GemFire 9.10.15. +* Upgrades to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.14.4. +* Upgrades to Spring Framework 5.3.17. +* Upgrades to Spring Boot 2.7.0-M3. +* Upgrades to Spring Data BOM 2021.2.0-M4 (RAJ-M4). +* Upgrades to Spring Data for Apache Geode 2.7.0-M4. +* Upgrades to Spring Session for Apache Geode 2.7.0-M2 +* Upgrades to Spring Test for Apache Geode 0.3.0-RAJ-M3. + + Changes in version 1.6.5 (2022-03-24) ------------------------------------- Aligns SBDG with Spring Boot 2.6.5. From 0cfe7e0cc99e030550382add4cd217e05e5f9f1b Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 20:47:03 -0700 Subject: [PATCH 045/201] Release 1.7.0-M3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6c90fefde..24e40d822 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0-M1 springSessionDataGeodeVersion=2.7.0-M2 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 -version=1.7.0-SNAPSHOT +version=1.7.0-M3 From 823cb35b11185caba345ced7264f2eb6007af0a4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 21:01:06 -0700 Subject: [PATCH 046/201] Prepare next development iteration. Set Spring Boot version to 2.7.0-SNAPSHOT. Set version to 1.7.0-SNAPSHOT. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 24e40d822..bab13741b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 springVersion=5.3.17 -springBootVersion=2.7.0-M3 +springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M4 springDataGeodeVersion=2.7.0-M4 @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0-M1 springSessionDataGeodeVersion=2.7.0-M2 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 -version=1.7.0-M3 +version=1.7.0-SNAPSHOT From 32ff9fe74ffefe1628b0f4db24c41fb498e80ba6 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 24 Mar 2022 21:15:19 -0700 Subject: [PATCH 047/201] Edit README to refer to 1.7.0-M3 release and 1.7.0-SNAPSHOT. Refer to Spring Boot 2.7.0-M3 documentation. --- README.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index aefa00c0a..2bc3cfedd 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ :spring-docs: https://docs.spring.io/spring-framework/docs/current/reference/html/ :sbdg-docs: https://docs.spring.io/spring-boot-data-geode-build/current/reference/html5/ :sbdg-javadoc: https://docs.spring.io/spring-boot-data-geode-build/current/api/ -:sbdg-version: 1.7.0-M2 -:spring-boot-version: 2.7.0-M2 +:sbdg-version: 1.7.0-M3 +:spring-boot-version: 2.7.0-M3 :geode-javadoc: https://geode.apache.org/releases/latest/javadoc :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire @@ -74,7 +74,7 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.0-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.7.0-M2`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] +| `1.7.0-M3`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.6-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.5`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] | `1.5.12-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] From 8b748b449cfc8c39351cd389b82c07864157ddeb Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 31 Mar 2022 12:14:46 -0700 Subject: [PATCH 048/201] Edit changelog and include 1.5.12 release notes. --- spring-geode/src/main/resources/changelog.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 67439df0b..c47ecca47 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,16 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.5.12 (2022-03-31) +-------------------------------------- +Aligns SBDG with Spring Boot 2.5.12. + +* Emergency release in response to: https://spring.io/blog/2022/03/31/spring-framework-rce-early-announcement, +and CVE: https://tanzu.vmware.com/security/cve-2022-22965. +* Upgrades to Spring Framework 5.3.18. +* Upgrades to Spring Boot 2.5.12. + + Changes in version 1.7.0-M3 (2022-03-24) ---------------------------------------- Aligns SBDG with Spring Boot 2.7.0-M3. From d77929bd0e0eb0afd612e34e3807aef82e0bbc60 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 31 Mar 2022 12:15:16 -0700 Subject: [PATCH 049/201] Edit README to refer to 1.5.12 release and 1.5.13-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 2bc3cfedd..f7419deb7 100644 --- a/README.adoc +++ b/README.adoc @@ -77,8 +77,8 @@ The following SBDG versions are currently maintained and developed. | `1.7.0-M3`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.6-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.5`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] -| `1.5.12-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.5.11`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] +| `1.5.13-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.5.12`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] |=== From 3fde1286e4ba931780a16650cb34061f0bf1f366 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 31 Mar 2022 12:16:48 -0700 Subject: [PATCH 050/201] Edit changelog and include 1.6.6 release notes. --- spring-geode/src/main/resources/changelog.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index c47ecca47..dcc020753 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,16 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.6 (2022-03-31) +-------------------------------------- +Aligns SBDG with Spring Boot 2.6.6. + +* Emergency release in response to: https://spring.io/blog/2022/03/31/spring-framework-rce-early-announcement, +and CVE: https://tanzu.vmware.com/security/cve-2022-22965. +* Upgrades to Spring Framework 5.3.18. +* Upgrades to Spring Boot 2.6.6. + + Changes in version 1.5.12 (2022-03-31) -------------------------------------- Aligns SBDG with Spring Boot 2.5.12. From b2d3240dcea22080fbeb91f298a12b4158619e1b Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 31 Mar 2022 12:17:17 -0700 Subject: [PATCH 051/201] Edit README to refer to 1.6.6 release and 1.6.7-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index f7419deb7..6837bb7a8 100644 --- a/README.adoc +++ b/README.adoc @@ -75,8 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.0-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.0-M3`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.6-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.5`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] +| `1.6.7-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.6`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] | `1.5.13-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.5.12`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] From aab51320c293fbfee921f8e6f886cf8b908ce3dd Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 31 Mar 2022 12:18:11 -0700 Subject: [PATCH 052/201] Upgrade to Spring Framework 5.3.18. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bab13741b..88687e8c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 -springVersion=5.3.17 +springVersion=5.3.18 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M4 From e57d611f7315aed58a4455eeedab41e12934654f Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 31 Mar 2022 12:29:05 -0700 Subject: [PATCH 053/201] Set Spring Geode Samples parent Maven POM Spring Boot version to 2.7.0-SNAPSHOT. --- spring-geode-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index 7234b45a7..8df1f8459 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.0-M3 + 2.7.0-SNAPSHOT From e12028b1d8252ddd568517f3018424ed4cc633d6 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 10:15:38 -0700 Subject: [PATCH 054/201] Upgrade to Spring Framework 5.3.19. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 88687e8c9..36301bfa0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 -springVersion=5.3.18 +springVersion=5.3.19 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-M4 From 152d9c5dcbcd88966b70c2a7e26c0ea09a2583dd Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 12:57:37 -0700 Subject: [PATCH 055/201] Edit changelog and include 1.5.13 release notes. --- spring-geode/src/main/resources/changelog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index dcc020753..961f8a650 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,18 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.5.13 (2022-04-21) +-------------------------------------- +Aligns SBDG with Spring Boot 2.5.13. + +* Built on Java 8, JDK 1.8.0_331. +* Upgrades to Spring Framework 5.3.19. +* Upgrades to Spring Boot 2.5.13. +* Upgrades to Spring Data BOM 2021.0.11 (Pascal-SR11). +* Upgrades to Spring Data for Apache Geode 2.5.11. +* Upgrades to Spring Session BOM 2021.0.6 + + Changes in version 1.6.6 (2022-03-31) -------------------------------------- Aligns SBDG with Spring Boot 2.6.6. From e05bc3406aa1e9ebe0b93bd6a3b16bb56dc78174 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 12:58:18 -0700 Subject: [PATCH 056/201] Edit README to refer to 1.5.13 release and 1.5.14-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 6837bb7a8..ef4fc6180 100644 --- a/README.adoc +++ b/README.adoc @@ -77,8 +77,8 @@ The following SBDG versions are currently maintained and developed. | `1.7.0-M3`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.7-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.6`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] -| `1.5.13-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.5.12`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] +| `1.5.14-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.5.13`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] |=== From 3af73c8a68cc6dc24d20bd91cff6fb00cdd16ddf Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 12:59:08 -0700 Subject: [PATCH 057/201] Edit changelog and include 1.6.7 release notes. --- spring-geode/src/main/resources/changelog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 961f8a650..d7ef5052b 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,18 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.7 (2022-04-21) +------------------------------------- +Aligns SBDG with Spring Boot 2.6.7. + +* Built on Java 8, JDK 1.8.0_331. +* Upgrades to Spring Framework 5.3.19. +* Upgrades to Spring Boot 2.6.7. +* Upgrades to Spring Data BOM 2021.1.4 (Q-SR4). +* Upgrades to Spring Data for Apache Geode 2.6.4. +* Upgrades to Spring Session BOM 2021.1.3. + + Changes in version 1.5.13 (2022-04-21) -------------------------------------- Aligns SBDG with Spring Boot 2.5.13. From 198048d0f38bab88423b4db5198efe6ef5425387 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 12:59:57 -0700 Subject: [PATCH 058/201] Edit README to refer to 1.6.7 release and 1.6.8-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index ef4fc6180..658fddcc6 100644 --- a/README.adoc +++ b/README.adoc @@ -75,8 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.0-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.0-M3`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.7-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.6`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] +| `1.6.8-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.7`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] | `1.5.14-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.5.13`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] From 58d6d02d21e6a7a618cdcb62761f34f22e80b7ee Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 13:01:44 -0700 Subject: [PATCH 059/201] Upgrade to Spring Data BOM 2021.2.0-RC1 (Raj-RC1). --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 36301bfa0..3e0253ba0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.15 springVersion=5.3.19 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.0-M4 +springDataBomVersion=2021.2.0-RC1 springDataGeodeVersion=2.7.0-M4 springDataGeodeTestVersion=0.3.0-RAJ-M3 springSessionBomVersion=2021.2.0-M1 From 84c3cac4ae6de63e0f8f30b6a4e0395b0c288add Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 13:02:07 -0700 Subject: [PATCH 060/201] Upgrade to Spring Data for Apache Geode 2.7.0-RC1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3e0253ba0..200a9e368 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.19 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-RC1 -springDataGeodeVersion=2.7.0-M4 +springDataGeodeVersion=2.7.0-RC1 springDataGeodeTestVersion=0.3.0-RAJ-M3 springSessionBomVersion=2021.2.0-M1 springSessionDataGeodeVersion=2.7.0-M2 From 5571606b374b8a80d26cb07297d54710252654f9 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 13:02:52 -0700 Subject: [PATCH 061/201] Upgrade to Spring Session BOM 2021.2.0-RC1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 200a9e368..ce9157a5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-RC1 springDataGeodeVersion=2.7.0-RC1 springDataGeodeTestVersion=0.3.0-RAJ-M3 -springSessionBomVersion=2021.2.0-M1 +springSessionBomVersion=2021.2.0-RC1 springSessionDataGeodeVersion=2.7.0-M2 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 From 576ef353749575b6d95513ddb66d38e2c829b6cf Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 13:03:10 -0700 Subject: [PATCH 062/201] Upgrade to Spring Session for Apache Geode 2.7.0-RC1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ce9157a5d..81f29531d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ springDataBomVersion=2021.2.0-RC1 springDataGeodeVersion=2.7.0-RC1 springDataGeodeTestVersion=0.3.0-RAJ-M3 springSessionBomVersion=2021.2.0-RC1 -springSessionDataGeodeVersion=2.7.0-M2 +springSessionDataGeodeVersion=2.7.0-RC1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 version=1.7.0-SNAPSHOT From 7829939859d876997416418c5d14b31c53f62659 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 13:04:02 -0700 Subject: [PATCH 063/201] Upgrade to Spring Test for Apache Geode 2.7.0-RC1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 81f29531d..092c3ccae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-RC1 springDataGeodeVersion=2.7.0-RC1 -springDataGeodeTestVersion=0.3.0-RAJ-M3 +springDataGeodeTestVersion=0.3.0-RAJ-RC1 springSessionBomVersion=2021.2.0-RC1 springSessionDataGeodeVersion=2.7.0-RC1 springShellVersion=1.2.0.RELEASE From ee08cccd0c55df80876b360319e4007767fd36a1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 16:43:09 -0700 Subject: [PATCH 064/201] Upgrade to Spring Boot 2.7.0-RC1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 092c3ccae..13ae30ea7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 springVersion=5.3.19 -springBootVersion=2.7.0-SNAPSHOT +springBootVersion=2.7.0-RC1 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-RC1 springDataGeodeVersion=2.7.0-RC1 From 9cc56fde693a14f7f9767b039465cfa3ef7eb606 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 17:03:32 -0700 Subject: [PATCH 065/201] Edit changelog and add 1.7.0-RC1 release notes. --- spring-geode/src/main/resources/changelog.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index d7ef5052b..a291a50ff 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,20 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.7.0-RC1 (2022-04-21) +----------------------------------------- +Aligns SBDG with Spring Boot 2.7.0-RC1. + +* Built on Java 8, JDK 1.8.0_331. +* Upgrades to Spring Framework 5.3.19. +* Upgrades to Spring Boot 2.7.0-RC1. +* Upgrades to Spring Data BOM 2021.2.0-RC1 (Raj-RC1). +* Upgrades to Spring Data for Apache Geode 2.7.0-RC1. +* Upgrades to Spring Session BOM 2021.2.0-RC1. +* Upgrades to Spring Session for Apache Geode 2.7.0-RC1. +* Upgrades to Spring Test for Apache Geode 0.3.0-RAJ-RC1. + + Changes in version 1.6.7 (2022-04-21) ------------------------------------- Aligns SBDG with Spring Boot 2.6.7. From 228d1ed2c11d717a27518eea7dd24513947c8453 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 17:07:08 -0700 Subject: [PATCH 066/201] Release 1.7.0-RC1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 13ae30ea7..15ad0b00d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0-RC1 springSessionDataGeodeVersion=2.7.0-RC1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 -version=1.7.0-SNAPSHOT +version=1.7.0-RC1 From f5f34898a07e692086a2d1c980da7ae8ac1df731 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 17:17:36 -0700 Subject: [PATCH 067/201] Prepare next development iteration. Set Spring Boot version to 2.7.0-SNAPSHOT. Set version to 1.7.0-SNAPSHOT. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 15ad0b00d..092c3ccae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 springVersion=5.3.19 -springBootVersion=2.7.0-RC1 +springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-RC1 springDataGeodeVersion=2.7.0-RC1 @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0-RC1 springSessionDataGeodeVersion=2.7.0-RC1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 -version=1.7.0-RC1 +version=1.7.0-SNAPSHOT From 87d48f707727f76d3672d1ab194a1bf7afec1dfc Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Apr 2022 17:34:54 -0700 Subject: [PATCH 068/201] Edit README to refer to 1.7.0-RC1 release and 1.7.0-SNAPSHOT. Refer to Spring Boot 2.7.0-RC1 documentation. --- README.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 658fddcc6..5eedc8602 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ :spring-docs: https://docs.spring.io/spring-framework/docs/current/reference/html/ :sbdg-docs: https://docs.spring.io/spring-boot-data-geode-build/current/reference/html5/ :sbdg-javadoc: https://docs.spring.io/spring-boot-data-geode-build/current/api/ -:sbdg-version: 1.7.0-M3 -:spring-boot-version: 2.7.0-M3 +:sbdg-version: 1.7.0-RC1 +:spring-boot-version: 2.7.0-RC1 :geode-javadoc: https://geode.apache.org/releases/latest/javadoc :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire @@ -74,7 +74,7 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.0-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.7.0-M3`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] +| `1.7.0-RC1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.8-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.7`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] | `1.5.14-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] From b181c3353c63ea21fa3410dcf46aac1e1d03ac23 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 3 May 2022 17:08:03 -0700 Subject: [PATCH 069/201] Reconfigure the Jenkins CI build pipeline. * Configure the buld to use the VMW provided Harbor DockerHub Proxy. * Use pipeline.properties to parameterize the build. * Remove Docker logins (docker.withRegistry(..) directtives in Jenkinsfile & 'docker login' command in setup.sh). --- Jenkinsfile | 102 +++++++++++++++++++---------------------- ci/pipeline.properties | 14 ++++++ ci/setup.sh | 4 +- 3 files changed, 63 insertions(+), 57 deletions(-) create mode 100644 ci/pipeline.properties diff --git a/Jenkinsfile b/Jenkinsfile index 56e66aca2..2a0b92629 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,13 +1,14 @@ +def p = [:] + +node { + checkout scm + p = readProperties interpolate: true, file: 'ci/pipeline.properties' +} + pipeline { agent any -/* - environment { - JAVA_HOME = "${tool 'jdk8'}" - } - */ - options { buildDiscarder(logRotator(numToKeepStr: '15')) disableConcurrentBuilds() @@ -20,40 +21,35 @@ pipeline { stages { stage('Build') { - environment { - DOCKER_HUB = credentials('hub.docker.com-springbuildmaster') - } options { timeout(time: 15, unit: "MINUTES") } steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp') { + docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) { - sh "echo 'Setup build environment...'" - sh "ci/setup.sh" + sh "echo 'Setup build environment...'" + sh "ci/setup.sh" - // Cleanup any prior build system resources - try { - sh "echo 'Clean up GemFire/Geode files & build artifacts...'" - sh "ci/cleanupGemFiles.sh" - sh "ci/cleanupArtifacts.sh" - } - catch (ignore) { } + // Cleanup any prior build system resources + try { + sh "echo 'Clean up GemFire/Geode files & build artifacts...'" + sh "ci/cleanupGemFiles.sh" + sh "ci/cleanupArtifacts.sh" + } + catch (ignore) { } - // Run the SBDG project Gradle build using JDK 8 inside Docker - try { - sh "echo 'Building SBDG...'" - sh "ci/check.sh" - } - catch (e) { - currentBuild.result = "FAILED: build" - throw e - } - finally { - junit '**/build/test-results/*/*.xml' - } + // Run the SBDG project Gradle build using JDK 8 inside Docker + try { + sh "echo 'Building SBDG...'" + sh "ci/check.sh" + } + catch (e) { + currentBuild.result = "FAILED: build" + throw e + } + finally { + junit '**/build/test-results/*/*.xml' } } } @@ -66,16 +62,14 @@ pipeline { } steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('adoptopenjdk/openjdk8:latest').inside("--name ${env.HOSTNAME}Two -u root -v /tmp:/tmp") { - withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - try { - sh "ci/deployDocs.sh" - } - catch (e) { - currentBuild.result = "FAILED: deploy docs" - throw e - } + docker.image('adoptopenjdk/openjdk8:latest').inside("--name ${env.HOSTNAME}Two -u root -v /tmp:/tmp") { + withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { + try { + sh "ci/deployDocs.sh" + } + catch (e) { + currentBuild.result = "FAILED: deploy docs" + throw e } } } @@ -89,19 +83,17 @@ pipeline { } steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('adoptopenjdk/openjdk8:latest').inside("--name ${env.HOSTNAME}One -u root -v /tmp:/tmp") { - withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) { - withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) { - withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) { - withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { - try { - sh "ci/deployArtifacts.sh" - } - catch (e) { - currentBuild.result = "FAILED: deploy artifacts" - throw e - } + docker.image('adoptopenjdk/openjdk8:latest').inside("--name ${env.HOSTNAME}One -u root -v /tmp:/tmp") { + withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) { + withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) { + withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) { + withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { + try { + sh "ci/deployArtifacts.sh" + } + catch (e) { + currentBuild.result = "FAILED: deploy artifacts" + throw e } } } diff --git a/ci/pipeline.properties b/ci/pipeline.properties new file mode 100644 index 000000000..1ae0d73ec --- /dev/null +++ b/ci/pipeline.properties @@ -0,0 +1,14 @@ +# Java (JDK) versions +java.main.tag=8u322-b06-jdk + +# Docker Container Images +docker.container.image.java.main=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag} + +# Docker Environment Settings +docker.container.inside.env.basic=-u root -v $HOME:/tmp/jenkins-home -v /tmp:/tmp +docker.container.inside.env.full=-u root -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v $HOME:/tmp/jenkins-home + +# Credentials +docker.registry= +docker.credentials=hub.docker.com-springbuildmaster +artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c diff --git a/ci/setup.sh b/ci/setup.sh index 0235c9b10..732b9b4c9 100755 --- a/ci/setup.sh +++ b/ci/setup.sh @@ -9,6 +9,6 @@ chown -R 1001:1001 . mkdir -p /tmp/geode/boot/artifacts-gradle-cache mkdir -p /tmp/geode/boot/build-gradle-cache mkdir -p /tmp/geode/boot/docs-gradle-cache -echo "Logging into Docker..." -docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW} +#echo "Logging into Docker..." +#docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW} exit 0 From 81aecbcf8e75480aa3f6bc4334e4ff8a7c609db5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 18 May 2022 14:18:14 -0700 Subject: [PATCH 070/201] Upgrade to Spring Framework 5.3.20. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 092c3ccae..910340895 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 -springVersion=5.3.19 +springVersion=5.3.20 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0-RC1 From f01a739dc2238e5ca928f89e6672c711048c250e Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 18 May 2022 14:19:11 -0700 Subject: [PATCH 071/201] Upgrade to Spring Data BOM 2021.2.0 (Raj-GA). --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 910340895..073a524ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.15 springVersion=5.3.20 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.0-RC1 +springDataBomVersion=2021.2.0 springDataGeodeVersion=2.7.0-RC1 springDataGeodeTestVersion=0.3.0-RAJ-RC1 springSessionBomVersion=2021.2.0-RC1 From f1c63a816211e95c71580c8dd4ffe54bda8855cb Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 18 May 2022 14:19:38 -0700 Subject: [PATCH 072/201] Upgrade to Spring Data for Apache Geode 2.7.0. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 073a524ea..c30ba584e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.20 springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0 -springDataGeodeVersion=2.7.0-RC1 +springDataGeodeVersion=2.7.0 springDataGeodeTestVersion=0.3.0-RAJ-RC1 springSessionBomVersion=2021.2.0-RC1 springSessionDataGeodeVersion=2.7.0-RC1 From b20a5cf8cdf89673782242b094c68f9b7156f4ac Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 18 May 2022 14:20:04 -0700 Subject: [PATCH 073/201] Upgrade to Spring Test for Apache Geode 0.3.0-RAJ (GA). --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c30ba584e..f69be7986 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ springBootVersion=2.7.0-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0 springDataGeodeVersion=2.7.0 -springDataGeodeTestVersion=0.3.0-RAJ-RC1 +springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0-RC1 springSessionDataGeodeVersion=2.7.0-RC1 springShellVersion=1.2.0.RELEASE From a96e0a812a1f43811ce68bada377b8d03f74280c Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 18 May 2022 14:20:27 -0700 Subject: [PATCH 074/201] Upgrade to Spring Session for Apache Geode 2.7.0. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f69be7986..a02afd979 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ springDataBomVersion=2021.2.0 springDataGeodeVersion=2.7.0 springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0-RC1 -springSessionDataGeodeVersion=2.7.0-RC1 +springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 version=1.7.0-SNAPSHOT From 70959bd215ab8969403951ee0a8e3ea995ae46c4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 18 May 2022 14:29:01 -0700 Subject: [PATCH 075/201] Adapt to API changes in Spring Data for Apache Geode 2.7.0. --- .../EnvironmentSourcedGemFirePropertiesAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java index b5397c9f0..5869856e3 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java @@ -72,7 +72,7 @@ @SuppressWarnings("unused") public class EnvironmentSourcedGemFirePropertiesAutoConfiguration { - private static final String GEMFIRE_PROPERTY_PREFIX = GemFireProperties.PROPERTY_NAME_PREFIX; + private static final String GEMFIRE_PROPERTY_PREFIX = GemFireProperties.GEMFIRE_PROPERTY_NAME_PREFIX; private final Logger logger = LoggerFactory.getLogger(EnvironmentSourcedGemFirePropertiesAutoConfiguration.class); From 3def34069944792bb5b8028eef2c09211d344a66 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 12:53:01 -0700 Subject: [PATCH 076/201] Edit changelog and include 1.5.14 release notes. --- spring-geode/src/main/resources/changelog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index a291a50ff..440b0be7c 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,15 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.5.14 (2022-05-19) +-------------------------------------- +Aligns SBDG with Spring Boot 2.5.15. + +* Built with Java 8, JDK 1.8.0_331. +* Upgrades to Spring Framework 5.3.20. +* Upgrades to Spring Boot 2.5.14. + + Changes in version 1.7.0-RC1 (2022-04-21) ----------------------------------------- Aligns SBDG with Spring Boot 2.7.0-RC1. From 29d78162ed576812cd1a5dac8e222453a9df9801 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 12:53:42 -0700 Subject: [PATCH 077/201] Edit README to refer to 1.5.14 release and 1.5.15-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 5eedc8602..449f6957b 100644 --- a/README.adoc +++ b/README.adoc @@ -77,8 +77,8 @@ The following SBDG versions are currently maintained and developed. | `1.7.0-RC1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.8-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.7`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] -| `1.5.14-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.5.13`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] +| `1.5.15-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.5.14`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] |=== From b24fc42e2f6a3d1792ee595ce0875932f00a063a Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 12:54:17 -0700 Subject: [PATCH 078/201] Edit changelog and include 1.6.8 release notes. --- spring-geode/src/main/resources/changelog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 440b0be7c..37f699986 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,15 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.8 (2022-05-19) +------------------------------------- +Aligns SBDG with Spring Boot 2.6.8. + +* Built with Java 8, JDK 1.8.0_331. +* Upgrades to Spring Framework 5.3.20. +* Upgrades to Spring Boot 2.6.8. + + Changes in version 1.5.14 (2022-05-19) -------------------------------------- Aligns SBDG with Spring Boot 2.5.15. From 331ed5c20813c3fee27d03c204af4117713eb378 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 12:55:06 -0700 Subject: [PATCH 079/201] Edit README to refer to 1.6.8 release and 1.6.9-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 449f6957b..88384143b 100644 --- a/README.adoc +++ b/README.adoc @@ -75,8 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.0-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.0-RC1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.8-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.7`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] +| `1.6.9-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.8`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] | `1.5.15-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.5.14`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] From baa596ddaef5f12ad22c94d1cc820843f375e5d0 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 12:56:58 -0700 Subject: [PATCH 080/201] Upgrade to Spring Boot 2.7.0. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a02afd979..6d2b686d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 springVersion=5.3.20 -springBootVersion=2.7.0-SNAPSHOT +springBootVersion=2.7.0 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0 springDataGeodeVersion=2.7.0 From d492bb5c2eb15b716faa262988446b9e361a7ec1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 12:58:05 -0700 Subject: [PATCH 081/201] Upgrade to Spring Session BOM 2021.2.0. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6d2b686d3..7c1b39cc7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0 springDataGeodeVersion=2.7.0 springDataGeodeTestVersion=0.3.0-RAJ -springSessionBomVersion=2021.2.0-RC1 +springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 From 7d6ab25e43eebe9e5d2eec937d24b50830bd7438 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 13:01:53 -0700 Subject: [PATCH 082/201] Edit changelog and add 1.7.0 release notes. --- spring-geode/src/main/resources/changelog.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 37f699986..7739d3d49 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,20 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.7.0 (2022-05-19) +------------------------------------- +Aligns SBDG with Spring Boot 2.7.0 + +* Built with Java 8, JDK 1.8.0_331. +* Upgrades to Spring Framework 5.3.20. +* Upgrades to Spring Boot 2.7.0. +* Upgrades to Spring Data BOM 2021.2.0 (Raj-GA). +* Upgrades to Spring Data for Apache Geode 2.7.0. +* Upgrades to Spring Session BOM 2021.2.0. +* Upgrades to Spring Session for Apache Geode 2.7.0. +* Upgrades to Spring Test for Apache Geode 0.3.0-RAJ. + + Changes in version 1.6.8 (2022-05-19) ------------------------------------- Aligns SBDG with Spring Boot 2.6.8. From 8c95d2a5d5f0825a2e23ca11241c7b176ff51011 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 13:19:44 -0700 Subject: [PATCH 083/201] Upgrade Spring Geode Samples parent Maven POM to Spring Boot 2.7.0. --- spring-geode-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index 8df1f8459..8cdec3ef6 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.0-SNAPSHOT + 2.7.0 From 74440f7ccc13b372a7a4669bcc5b4e79b76a16b2 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 13:21:00 -0700 Subject: [PATCH 084/201] Release 1.7.0. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7c1b39cc7..aa93f642c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 -version=1.7.0-SNAPSHOT +version=1.7.0 From 28ac805ddd617c096a9e7e06658a12da55de00a8 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 13:33:42 -0700 Subject: [PATCH 085/201] Prepare next development iteration. Set Spring Boot version to 2.7.1-SNAPSHOT. Set version to 1.7.1-SNAPSHOT. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index aa93f642c..b4cb8d181 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 springVersion=5.3.20 -springBootVersion=2.7.0 +springBootVersion=2.7.1-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0 springDataGeodeVersion=2.7.0 @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.16.3 -version=1.7.0 +version=1.7.1-SNAPSHOT From 024fbf6ea5e5e6b5aa816161ba8e415292a580d2 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 19 May 2022 13:48:39 -0700 Subject: [PATCH 086/201] Edit README to refer to 1.7.0 release and 1.7.1-SNAPSHOT. Refer to Spring Boot 2.7.0 in references. --- README.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 88384143b..6fc1776a9 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ :spring-docs: https://docs.spring.io/spring-framework/docs/current/reference/html/ :sbdg-docs: https://docs.spring.io/spring-boot-data-geode-build/current/reference/html5/ :sbdg-javadoc: https://docs.spring.io/spring-boot-data-geode-build/current/api/ -:sbdg-version: 1.7.0-RC1 -:spring-boot-version: 2.7.0-RC1 +:sbdg-version: 1.7.0 +:spring-boot-version: 2.7.0 :geode-javadoc: https://geode.apache.org/releases/latest/javadoc :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire @@ -73,8 +73,8 @@ The following SBDG versions are currently maintained and developed. | Version | Reference Documentation | Javadoc | Samples | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] -| `1.7.0-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.7.0-RC1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] +| `1.7.1-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.7.0`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.9-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.8`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] | `1.5.15-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] From 365f7a1875638dc29390c20240bfc12721ff36bf Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:16:03 -0700 Subject: [PATCH 087/201] Edit changelog and include 1.6.9 release notes. --- spring-geode/src/main/resources/changelog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 7739d3d49..826bcbaaf 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,18 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.9 (2022-06-24) +------------------------------------- +Aligns SBDG with Spring Boot 2.6.9. + +* Built with Oracle Java 8, JDK 1.8.0_331. +* Upgrades to Spring Framework 5.3.21. +* Upgrades to Spring Boot 2.6.9. +* Upgrades to Spring Data BOM 2021.1.5 (Q-SR5). +* Upgrades to Spring Data for Apache Geode 2.6.5. +* Upgrades to Testcontainers 1.17.2 + + Changes in version 1.7.0 (2022-05-19) ------------------------------------- Aligns SBDG with Spring Boot 2.7.0 From 1b3a691a4ad20476ec95f8c115fe40f0938e9d8e Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:16:59 -0700 Subject: [PATCH 088/201] Edit README to refer to 1.6.9 release and 1.6.10-SNAPSHOT. Move SBDG 1.5.x to EOL section. --- README.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 6fc1776a9..40db4c4a7 100644 --- a/README.adoc +++ b/README.adoc @@ -75,10 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.1-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.0`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.9-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.8`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] -| `1.5.15-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.5.14`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] +| `1.6.10-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.9`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] |=== @@ -88,6 +86,8 @@ The following SBDG versions have reached their End-of-Life (EOL). |=== | Version | Reference Documentation | Javadoc | Samples +| `1.5.15-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.5.14`| https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.5.x/reference/html5/#geode-samples[Samples] | `1.4.14-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.4.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.4.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.4.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.4.13` | https://docs.spring.io/spring-boot-data-geode-build/1.4.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.4.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.4.x/reference/html5/#geode-samples[Samples] | `1.3.13.BUILD-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.3.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.3.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.3.x-SNAPSHOT/reference/html5/#geode-samples[Samples] From 848d193a440046d58d2813767dd81751c75d934c Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:19:06 -0700 Subject: [PATCH 089/201] Upgrade to Spring Framework 5.3.21. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b4cb8d181..8bca86813 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 -springVersion=5.3.20 +springVersion=5.3.21 springBootVersion=2.7.1-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0 From 6add86be5e0bff03e02a57f50340f100b40f944a Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:19:19 -0700 Subject: [PATCH 090/201] Upgrade to Spring Boot 2.7.1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8bca86813..1b44769d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 springVersion=5.3.21 -springBootVersion=2.7.1-SNAPSHOT +springBootVersion=2.7.1 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.0 springDataGeodeVersion=2.7.0 From 59efe201c7db91ea003d0be1bbbae60e3d7ebbb7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:20:06 -0700 Subject: [PATCH 091/201] Upgrade to Spring Data BOM 2021.2.1 (RAJ-SR1). Refers to Spring Data 2.7.1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1b44769d8..bbe096b3b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.15 springVersion=5.3.21 springBootVersion=2.7.1 springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.0 +springDataBomVersion=2021.2.1 springDataGeodeVersion=2.7.0 springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0 From acc030f9e408ae33c3d4b83afb904903563cb4ec Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:20:31 -0700 Subject: [PATCH 092/201] Upgrade to Spring Data for Apache Geode 2.7.1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bbe096b3b..46f08d01a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.21 springBootVersion=2.7.1 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.1 -springDataGeodeVersion=2.7.0 +springDataGeodeVersion=2.7.1 springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 From 0d9c1bbf73c6991a84d30765159be98b5a30b4ef Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:22:21 -0700 Subject: [PATCH 093/201] Upgrade to Testcontainers 1.17.2. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 46f08d01a..99f22da46 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE -testcontainersVersion=1.16.3 +testcontainersVersion=1.17.2 version=1.7.1-SNAPSHOT From d9268b2bb00905f5c012afc53015aa25b4d3af7a Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:27:58 -0700 Subject: [PATCH 094/201] Upgrade Spring Geode Samples parent Maven POM to Spring Boot 2.7.1 and SBDG 1.7.1-SNAPSHOT. --- spring-geode-samples/intro/getting-started/pom.xml | 2 +- spring-geode-samples/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-geode-samples/intro/getting-started/pom.xml b/spring-geode-samples/intro/getting-started/pom.xml index 53f516743..c32575d71 100644 --- a/spring-geode-samples/intro/getting-started/pom.xml +++ b/spring-geode-samples/intro/getting-started/pom.xml @@ -8,7 +8,7 @@ org.springframework.geode spring-geode-samples-parent - 1.7.0-SNAPSHOT + 1.7.1-SNAPSHOT ../../pom.xml diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index 8cdec3ef6..a46a3d3cd 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,13 +8,13 @@ org.springframework.boot spring-boot-starter-parent - 2.7.0 + 2.7.1 org.springframework.geode spring-geode-samples-parent - 1.7.0-SNAPSHOT + 1.7.1-SNAPSHOT pom Spring Geode Samples Parent @@ -42,19 +42,19 @@ org.springframework.geode spring-geode-starter - 1.7.0-SNAPSHOT + 1.7.1-SNAPSHOT org.springframework.geode spring-geode-starter-logging - 1.7.0-SNAPSHOT + 1.7.1-SNAPSHOT org.springframework.geode spring-geode-starter-test - 1.7.0-SNAPSHOT + 1.7.1-SNAPSHOT From 04763dd2a24acd475b2850de7f85285dd1999e0d Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:28:13 -0700 Subject: [PATCH 095/201] Edit changelog and add 1.7.1 release notes. --- spring-geode/src/main/resources/changelog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 826bcbaaf..bda7ceb15 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,18 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.7.1 (2022-06-24) +------------------------------------- +Aligns SBDG with Spring Boot 2.7.1 + +* Built with Oracle Java 8, JDK 1.8.0_331. +* Upgrades to Spring Framework 5.3.21. +* Upgrades to Spring Boot 2.7.1. +* Upgrades to Spring Data BOM 2021.2.1 (RAJ-SR1). +* Upgrades to Spring Data for Apache Geode 2.7.1 +* Upgrades to Testcontainers 1.17.2 + + Changes in version 1.6.9 (2022-06-24) ------------------------------------- Aligns SBDG with Spring Boot 2.6.9. From cad09b9eef26d0cf9ba0c6c5749806ad3e4e6a1f Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:38:26 -0700 Subject: [PATCH 096/201] Release 1.7.1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 99f22da46..bdd7855b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.2 -version=1.7.1-SNAPSHOT +version=1.7.1 From 91e2a728c5bad2110f286094cc66f072adbc3a99 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 17:49:15 -0700 Subject: [PATCH 097/201] Prepare next development iteration. Set Spring Boot version to 2.7.2-SNAPSHOT. Set version to 1.7.2-SNAPSHOT. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index bdd7855b5..2a668297c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 springVersion=5.3.21 -springBootVersion=2.7.1 +springBootVersion=2.7.2-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.1 springDataGeodeVersion=2.7.1 @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.2 -version=1.7.1 +version=1.7.2-SNAPSHOT From 7703510bf41a0d8ab5e30472388d61aaafc68ab1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Jun 2022 18:04:53 -0700 Subject: [PATCH 098/201] Edit README to refer to 1.7.1 and 1.7.2-SNAPSHOT. --- README.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 40db4c4a7..eef3b033a 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ :spring-docs: https://docs.spring.io/spring-framework/docs/current/reference/html/ :sbdg-docs: https://docs.spring.io/spring-boot-data-geode-build/current/reference/html5/ :sbdg-javadoc: https://docs.spring.io/spring-boot-data-geode-build/current/api/ -:sbdg-version: 1.7.0 -:spring-boot-version: 2.7.0 +:sbdg-version: 1.7.1 +:spring-boot-version: 2.7.1 :geode-javadoc: https://geode.apache.org/releases/latest/javadoc :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire @@ -73,8 +73,8 @@ The following SBDG versions are currently maintained and developed. | Version | Reference Documentation | Javadoc | Samples | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] -| `1.7.1-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.7.0`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] +| `1.7.2-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.7.1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.10-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.9`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] From e5183d886f4747179e2f3a549d75e86e3bd47d07 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 6 Jul 2022 14:20:36 -0700 Subject: [PATCH 099/201] Declare 'org.codehaus.janino:janino' as an implementation dependency in Spring Geode Starter Logging. This enables the SLF4J Logback configuration files to include conditional logic, such as if-then-else statements. Resolves #117. --- .../spring-geode-starter-logging.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-geode-starter-logging/spring-geode-starter-logging.gradle b/spring-geode-starter-logging/spring-geode-starter-logging.gradle index 758398bc5..7b61189db 100644 --- a/spring-geode-starter-logging/spring-geode-starter-logging.gradle +++ b/spring-geode-starter-logging/spring-geode-starter-logging.gradle @@ -1,7 +1,6 @@ apply plugin: 'io.spring.convention.spring-module' -apply from: MAVEN_POM_EDITOR_GRADLE -description = "Spring Boot Logging Starter for Apache Geode with Logback as the logging provider and adaptation of Log4j to SLF4J" +description = "Spring Boot Logging Starter for Apache Geode with Logback as the default logging provider and adaptation of JUL and Log4j to SLF4J" dependencies { @@ -9,6 +8,8 @@ dependencies { compile "org.apache.logging.log4j:log4j-to-slf4j" compile "org.springframework.boot:spring-boot-starter-logging" - testCompile project(":spring-geode-starter-test") + implementation "org.codehaus.janino:janino" + + testImplementation project(":spring-geode-starter-test") } From d93c93f36d0be97eaf85c63b4f0d81db1f3b0d6b Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 6 Jul 2022 14:23:12 -0700 Subject: [PATCH 100/201] Refactor and encapsulate Properties, Logger and Appender SLF4J Logback configuration (metadata) in separate includes (XML files) on the application classpath. Resolves #117. --- .../slf4j/logback/appender-include.xml | 24 +++++++++++++++++++ .../logging/slf4j/logback/logger-include.xml | 19 +++++++++++++++ .../slf4j/logback/properties-include.xml | 9 +++++++ 3 files changed, 52 insertions(+) create mode 100644 spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/appender-include.xml create mode 100644 spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/logger-include.xml create mode 100644 spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/properties-include.xml diff --git a/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/appender-include.xml b/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/appender-include.xml new file mode 100644 index 000000000..070a1f733 --- /dev/null +++ b/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/appender-include.xml @@ -0,0 +1,24 @@ + + + + + + + + ${SPRING_BOOT_LOG_CHARSET} + ${SPRING_BOOT_LOG_PATTERN} + + + + + + + + + + ${APACHE_GEODE_LOG_CHARSET} + ${APACHE_GEODE_LOG_PATTERN} + + + + diff --git a/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/logger-include.xml b/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/logger-include.xml new file mode 100644 index 000000000..bfccf713c --- /dev/null +++ b/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/logger-include.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/properties-include.xml b/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/properties-include.xml new file mode 100644 index 000000000..fec6cadd2 --- /dev/null +++ b/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/properties-include.xml @@ -0,0 +1,9 @@ + + + + + + + + + From b0f83ea9a2a036150a0ce9210dc8f08fc0cfb184 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 6 Jul 2022 14:24:01 -0700 Subject: [PATCH 101/201] Enable Spring Geode Logging configuration to be declared by the user in a spring-geode-logging.properties file on the Spring Boot application classpath. Resolves #117. --- .../src/main/resources/spring-geode-logging.properties | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 spring-geode-starter-logging/src/main/resources/spring-geode-logging.properties diff --git a/spring-geode-starter-logging/src/main/resources/spring-geode-logging.properties b/spring-geode-starter-logging/src/main/resources/spring-geode-logging.properties new file mode 100644 index 000000000..e5b43731e --- /dev/null +++ b/spring-geode-starter-logging/src/main/resources/spring-geode-logging.properties @@ -0,0 +1,3 @@ +# Spring (Boot) for Apache Geode Logging configuration properties + +spring.geode.logging.appender-ref=CONSOLE From 7422af074619e5da06da4246352727c57c3caea6 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 6 Jul 2022 14:29:55 -0700 Subject: [PATCH 102/201] Integrate Spring Geode Logging with Spring Boot Logging and externalizes configuration. * Deprecates the logback-include.xml file. * Declare the logging context name as 'geodeLoggingContext'. * Determines whether Spring Boot SLF4J Logback logging configuration (metadata) files are present on the application classpath. * Applies custom logging configuration declared by the user in the spring-geode-logging.properties file on the application classpath. * Conditionally includes SLF4J Logback logging configuration from Spring Boot. * Includes Appenders, Loggers and Properties configuration metadata files from Spring Geode Starter Logging. Resolves #117. --- .../src/main/resources/logback-include.xml | 1 + .../src/main/resources/logback.xml | 23 +++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/spring-geode-starter-logging/src/main/resources/logback-include.xml b/spring-geode-starter-logging/src/main/resources/logback-include.xml index 8f937515a..a19b2f274 100644 --- a/spring-geode-starter-logging/src/main/resources/logback-include.xml +++ b/spring-geode-starter-logging/src/main/resources/logback-include.xml @@ -1,4 +1,5 @@ + diff --git a/spring-geode-starter-logging/src/main/resources/logback.xml b/spring-geode-starter-logging/src/main/resources/logback.xml index bb6685c9c..0d5dff6b0 100644 --- a/spring-geode-starter-logging/src/main/resources/logback.xml +++ b/spring-geode-starter-logging/src/main/resources/logback.xml @@ -1,12 +1,31 @@ + geodeLoggingContext + - + + org/springframework/boot/logging/logback/defaults.xml + + + + + + + + + + + + + + + + - + From 081166a5e674078a5bfdb550aa2b5b49ecdcbbe5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 6 Jul 2022 18:09:10 -0700 Subject: [PATCH 103/201] Edit SBDG ref doc and include new information about logging with the spring-geode-starter-logging module. Closes #117. --- .../src/docs/asciidoc/_includes/logging.adoc | 127 +++++++++++++++--- 1 file changed, 110 insertions(+), 17 deletions(-) diff --git a/spring-geode-docs/src/docs/asciidoc/_includes/logging.adoc b/spring-geode-docs/src/docs/asciidoc/_includes/logging.adoc index 10694827e..69df940ca 100644 --- a/spring-geode-docs/src/docs/asciidoc/_includes/logging.adoc +++ b/spring-geode-docs/src/docs/asciidoc/_includes/logging.adoc @@ -75,7 +75,7 @@ So, how do you configure logging for {geode-name}? Three things are required to get {geode-name} to log output: -. You must declare a logging provider (such as Logback) on your Spring Boot application classpath. +. You must declare a logging provider (such as Logback, or Log4j) on your Spring Boot application classpath. . (optional) You can declare an adapter (a bridge JAR) between Log4j and your logging provider if your declared logging provider is not Apache Log4j. + @@ -96,22 +96,27 @@ NOTE: {geode-name}'s `geode-log4j` module covers the required configuration for (`org.apache.logging.log4j:log4j-core`) as the logging provider. The `geode-log4j` module even provides a default `log4j2.xml` configuration file to configure Loggers, Appenders, and log levels for {geode-name}. -If you declare Spring Boot's own `org.springframework.boot:spring-boot-starter-logging` on your application classpath, -it covers steps 1 and 2 above. +If you declare Spring Boot's own `org.springframework.boot:spring-boot-starter-logging` on your application +classpath, it covers steps 1 and 2 above. The `spring-boot-starter-logging` dependency declares Logback as the logging provider and automatically adapts (bridges) `java.util.logging` (JUL) and Apache Log4j to SLF4J. However, you still need to supply logging provider configuration (such as a `logback.xml` file for Logback) to configure logging not only for your Spring Boot application but for {geode-name} as well. +NOTE: If no user-specified logging configuration is supplied, Logback will apply default configuration +using the `BasicConfigurator`. See Logback https://logback.qos.ch/manual/configuration.html#auto_configuration[documentation] +for complete details. + SBDG has simplified the setup of {geode-name} logging. You need only declare the `org.springframework.geode:spring-geode-starter-logging` dependency on your Spring Boot application classpath. -Unlike {geode-name}'s default Log4j XML configuration file (`log4j2.xml`), SBDG's provided `logback.xml` configuration -file is properly parameterized, letting you adjust log levels as well as add Appenders. +Unlike {geode-name}'s default Log4j XML configuration file (`log4j2.xml` from `geode-log4j`), SBDG's provided +`logback.xml` configuration file is properly parameterized, letting you adjust log levels, add Appenders +as well as adjust other logging settings. In addition, SBDG's provided Logback configuration uses templates so that you can compose your own logging configuration -while still including snippets from SBDG's provided logging configuration metadata, such as Loggers and Appenders. +while still including snippets from SBDG's provided logging configuration, such as Loggers and Appenders. [[geode-logging-configuration-log-levels]] ==== Configuring Log Levels @@ -129,7 +134,7 @@ SBDG's Logback configuration defines three Loggers to control the log output fro - + ---- ==== @@ -142,7 +147,7 @@ during the runtime operation of {geode-name}. By default, it logs output at `INF The `org.jgroups` Logger is used to log output from {geode-name}'s message distribution and membership system. {geode-name} uses JGroups for membership and message distribution between peer members (nodes) in the cluster -(distributed system). By default, JGroups logs output at `ERROR`. +(distributed system). By default, JGroups logs output at `WARN`. You can configure the log level for the `com.gemstone.gemfire` and `org.apache.geode` Loggers by setting the `spring.boot.data.gemfire.log.level` property. You can independently configure the `org.jgroups` Logger by setting @@ -195,30 +200,118 @@ or later. As mentioned earlier, SBDG lets you compose your own logging configuration from SBDG's default Logback configuration metadata. -SBDG conveniently bundles the Loggers and Appenders from SBDG's logging starter into a template file that you can -include into your own custom Logback XML configuration file. +SBDG conveniently bundles the Properties, Loggers and Appenders from SBDG's logging starter into several template files +that you can include into your own custom Logback XML configuration file. + +The Logback configuration template files are broken down into: + +* `org/springframework/geode/logging/slf4j/logback/properties-include.xml` +* `org/springframework/geode/logging/slf4j/logback/loggers-include.xml` +* `org/springframework/geode/logging/slf4j/logback/appenders-include.xml` -The Logback template file appears as follows: +WARNING: As of SBDG `2.7`, the `logback-include.xml` file has been deprecated. -.logback-include.xml +The `properties-include.xml` defines Logback "_local_" scoped properties or variables common to SBDG's configuration +of {geode-name} logging. + +.properties-include.xml ==== [source,xml] ---- -include::{starter-logging-resources-dir}/logback-include.xml[] +include::{starter-logging-resources-dir}/org/springframework/geode/logging/slf4j/logback/properties-include.xml[] ---- ==== -Then you can include this Logback configuration snippet in an application-specific Logback XML configuration file, -as follows: +The `loggers-include.xml` file defines the `Loggers` used to log output from {geode-name} components. -.logback.xml +.loggers-include.xml ==== [source,xml] ---- -include::{starter-logging-resources-dir}/logback.xml[] +include::{starter-logging-resources-dir}/org/springframework/geode/logging/slf4j/logback/logger-include.xml[] ---- ==== +The `appenders-include.xml` file defines Appenders to send the log output to. If Spring Boot is on the application +classpath, then Spring Boot logging configuration will define the "CONSOLE" `Appender`, otherwise, SBDG will provide +a default definition. + +The "geode" `Appender` defines the {geode-name} logging pattern as seen in {geode-name}'s Log4j configuration. + +.appenders-include.xml +==== +[source,xml] +---- +include::{starter-logging-resources-dir}/org/springframework/geode/logging/slf4j/logback/appender-include.xml[] +---- +==== + +Then you can include any of SBDG'S Logback configuration metadata files as needed in your application-specific +Logback XML configuration file, as follows: + +.application-specific logback.xml +==== +[source,xml] +---- + + + + + + + + + + + + + + + + +---- +==== + +[[geode-logging-configuration-customizing]] +==== Customizing Logging Configuration + +It is now possible to customize the configuration of {geode-name} logging using properties defined in +a `spring-geode-logging.properties` file included on the Spring Boot application classpath. + +Any of the properties defined in `org/springframework/geode/logging/slf4j/logback/properties-include.xml` (shown above), +such as `APACHE_GEODE_LOG_PATTERN`, or the `spring.geode.logging.appender-ref` property, can be set. + +For instance, and by default, {geode-name} components log output using the Spring Boot log pattern. However, if you +prefer the fine-grained details of Apache Geode's logging behavior, you can change the `Appender` used by +the {geode-name} `Logger's` to use the pre-defined "geode" `Appender` instead. Simply set +the `spring-geode.logging.appender-ref` property to "geode" in a `spring-geode-logging.properties` file +on your Spring Boot application classpath, as follows: + +.spring-geode-logging.properties +==== +[source,properties] +---- +# spring-geode-logging.properties +spring.geode.logging.appender-ref=geode +---- +==== + +Alternatively, if you want to configure the log output of your entire Spring Boot application, including log output +from all {geode-name} components, then you can set the `SPRING_BOOT_LOG_PATTERN` property, or Spring Boot's +`CONSOLE_LOG_PATTERN` property, in `spring-geode-logging.properties`, as follows: + +.spring-geode-logging.properties +==== +[source,properties] +---- +# spring-geode-logging.properties +CONSOLE_LOG_PATTERN=TEST - %msg%n +---- +==== + +NOTE: The `spring-geode-logging.properties` file is only recognized when the `spring-geode-starter-logging` module +is used. + [[geode-logging-slf4j-logback-api-support]] === SLF4J and Logback API Support From d1618a99d61804672049495763d37d241c99b11c Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 7 Jul 2022 11:55:52 -0700 Subject: [PATCH 104/201] Ignore LOG_FILE_IS_UNDEFINED files from Spring Boot. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 60fea3b49..34ad6ec96 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ _site/ .classpath .project deps* +LOG_FILE_IS_UNDEFINED /samples/hello-world/vf.gf.dmn-events.cfg /samples/hello-world/vf.gf.dmn-license.cfg From 3504f74379f0586301a57854b46ec3c7aee2ccc7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 8 Jul 2022 19:23:23 -0700 Subject: [PATCH 105/201] Fix failing Inline Caching with Apache Cassandra Integration Tests. --- spring-geode/spring-geode.gradle | 1 + .../config/TestCassandraConfiguration.java | 212 +++++++++++++----- .../TestcontainersCassandraConfiguration.java | 138 ++++++++++-- .../java/example/app/crm/model/Customer.java | 11 +- ...ithExternalDataSourceIntegrationTests.java | 2 - ...eCachingWithCassandraIntegrationTests.java | 6 +- ...neCachingWithDatabaseIntegrationTests.java | 2 +- ...cation-inline-caching-cassandra.properties | 5 + ...ication-inline-caching-database.properties | 2 +- .../src/test/resources/cassandra-data.cql | 2 +- .../src/test/resources/cassandra-init.cql | 5 + .../src/test/resources/cassandra-schema.cql | 4 +- 12 files changed, 301 insertions(+), 89 deletions(-) create mode 100644 spring-geode/src/test/resources/application-inline-caching-cassandra.properties create mode 100644 spring-geode/src/test/resources/cassandra-init.cql diff --git a/spring-geode/spring-geode.gradle b/spring-geode/spring-geode.gradle index af84692e8..d70870746 100644 --- a/spring-geode/spring-geode.gradle +++ b/spring-geode/spring-geode.gradle @@ -27,6 +27,7 @@ dependencies { testCompile "org.mockito:mockito-core" testCompile "org.projectlombok:lombok" testCompile "org.testcontainers:testcontainers" + testCompile "org.testcontainers:cassandra" testCompile "edu.umd.cs.mtc:multithreadedtc" testCompile("org.springframework.boot:spring-boot-starter-test") { diff --git a/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java b/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java index 66dd6073b..cede16f06 100644 --- a/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java +++ b/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java @@ -15,96 +15,198 @@ */ package example.app.crm.config; -import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newRuntimeException; +import static org.assertj.core.api.Assertions.assertThat; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; +import java.util.Optional; +import java.util.function.Consumer; +import com.datastax.oss.driver.api.core.CqlIdentifier; +import com.datastax.oss.driver.api.core.session.Session; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.context.ApplicationListener; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Profile; +import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import org.springframework.data.cassandra.config.AbstractCassandraConfiguration; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.data.cassandra.config.CqlSessionFactoryBean; -import org.springframework.data.gemfire.tests.util.IOUtils; +import org.springframework.data.cassandra.core.CassandraTemplate; +import org.springframework.data.cassandra.core.cql.CqlTemplate; +import org.springframework.data.cassandra.core.cql.RowMapper; +import org.springframework.data.cassandra.core.cql.session.init.KeyspacePopulator; +import org.springframework.data.cassandra.core.cql.session.init.ResourceKeyspacePopulator; +import org.springframework.data.cassandra.core.cql.session.init.SessionFactoryInitializer; import org.springframework.lang.NonNull; -import org.springframework.lang.Nullable; -import org.springframework.util.StringUtils; + +import example.app.crm.model.Customer; +import example.app.crm.repo.CustomerRepository; /** * Base test configuration used to configure and bootstrap an Apache Cassandra database with a schema and data. * * @author John Blum + * @see com.datastax.oss.driver.api.core.session.Session + * @see org.springframework.beans.factory.config.BeanPostProcessor + * @see org.springframework.context.annotation.Bean * @see org.springframework.core.io.Resource - * @see org.springframework.data.cassandra.config.AbstractCassandraConfiguration + * @see org.springframework.data.cassandra.SessionFactory * @see org.springframework.data.cassandra.config.CqlSessionFactoryBean + * @see org.springframework.data.cassandra.core.CassandraTemplate + * @see org.springframework.data.cassandra.core.cql.CqlTemplate + * @see org.springframework.data.cassandra.core.cql.session.init.KeyspacePopulator + * @see org.springframework.data.cassandra.core.cql.session.init.SessionFactoryInitializer * @since 1.1.0 */ -public abstract class TestCassandraConfiguration extends AbstractCassandraConfiguration { +@SuppressWarnings("unused") +public abstract class TestCassandraConfiguration { + + private static final boolean CONTINUE_ON_ERROR = false; + private static final boolean IGNORE_FAILED_DROPS = true; + + private static final Customer pieDoe = Customer.newCustomer(16L, "Pie Doe"); + + private static final String CQL_SCRIPT_ENCODING = null; protected static final int CASSANDRA_DEFAULT_PORT = CqlSessionFactoryBean.DEFAULT_PORT; - private static final String CASSANDRA_DATA_CQL = "cassandra-data.cql"; - private static final String CASSANDRA_SCHEMA_CQL = "cassandra-schema.cql"; - private static final String LOCAL_DATA_CENTER = "datacenter1"; - private static final String KEYSPACE_NAME = "CustomerService"; - private static final String SESSION_NAME = "CustomerServiceCluster"; + protected static final String CASSANDRA_DATA_CQL = "cassandra-data.cql"; + protected static final String CASSANDRA_INIT_CQL = "cassandra-init.cql"; + protected static final String CASSANDRA_SCHEMA_CQL = "cassandra-schema.cql"; + protected static final String DEBUGGING_PROFILE = "debugging"; + protected static final String KEYSPACE_NAME = "CustomerService"; + protected static final String TABLE_NAME = "Customers"; + + protected @NonNull Resource newCassandraDataCqlScriptResource() { + return new ClassPathResource(CASSANDRA_DATA_CQL); + } + + protected @NonNull Resource newCassandraInitCqlScriptResource() { + return new ClassPathResource(CASSANDRA_INIT_CQL); + } + + protected @NonNull Resource newCassandraSchemaCqlScriptResource() { + return new ClassPathResource(CASSANDRA_SCHEMA_CQL); + } + + @Bean + SessionFactoryInitializer sessionFactoryInitializer(SessionFactory sessionFactory) { + + SessionFactoryInitializer sessionFactoryInitializer = new SessionFactoryInitializer(); + + KeyspacePopulator keyspacePopulator = newKeyspacePopulator(newCassandraDataCqlScriptResource()); + + sessionFactoryInitializer.setKeyspacePopulator(keyspacePopulator); + sessionFactoryInitializer.setSessionFactory(sessionFactory); + + return sessionFactoryInitializer; + } + + protected @NonNull KeyspacePopulator newKeyspacePopulator(Resource... cqlScripts) { + return new ResourceKeyspacePopulator(CONTINUE_ON_ERROR, IGNORE_FAILED_DROPS, CQL_SCRIPT_ENCODING, cqlScripts); + } + + @Bean + @Profile(DEBUGGING_PROFILE) + BeanPostProcessor cassandraTemplatePostProcessor() { + + return new BeanPostProcessor() { + + @Override + public Object postProcessAfterInitialization(@NonNull Object bean, @NonNull String beanName) throws BeansException { + + if (bean instanceof CassandraTemplate) { + + CassandraTemplate cassandraTemplate = (CassandraTemplate) bean; + + Consumer cassandraTemplateConsumer = noopCassandraTemplateConsumer() + .andThen(insertEntityObjectCassandraTemplateConsumer()) + .andThen(assertEntityCountCassandraTemplateConsumer()) + .andThen(assertEntityObjectCassandraTemplateConsumer()) + .andThen(assertKeyspaceNameCassandraTemplateConsumer()) + .andThen(assertTableNameCassandraTemplateConsumer()); + + cassandraTemplateConsumer.accept(cassandraTemplate); + } + + return bean; + } + }; + } - @NonNull - @Override - protected String getKeyspaceName() { - return KEYSPACE_NAME; + private Consumer noopCassandraTemplateConsumer() { + return cassandraTemplate -> {}; } - @Override - protected String getLocalDataCenter() { - return LOCAL_DATA_CENTER; + private Consumer assertEntityCountCassandraTemplateConsumer() { + return cassandraTemplate -> assertThat(cassandraTemplate.count(Customer.class)).isOne(); } - @Nullable - @Override - protected String getSessionName() { - return SESSION_NAME; + private Consumer assertEntityObjectCassandraTemplateConsumer() { + + return cassandraTemplate -> { + + String cql = "SELECT id, name FROM \"Customers\""; + + RowMapper customerRowMapper = (row, rowNumber) -> + Customer.newCustomer(row.getLong("id"), row.getString("name")); + + Customer actualCustomer = cassandraTemplate.getCqlOperations().queryForObject(cql, customerRowMapper); + + assertThat(actualCustomer).isEqualTo(pieDoe); + assertThat(cassandraTemplate.selectOneById(16L, Customer.class)).isEqualTo(pieDoe); + assertThat(cassandraTemplate.query(Customer.class).stream().findFirst().orElse(null)).isEqualTo(pieDoe); + }; } - /* - @Nullable @Override - protected KeyspacePopulator keyspacePopulator() { - return cqlSession -> loadCassandraCqlScripts().forEach(cqlSession::execute); + private Consumer insertEntityObjectCassandraTemplateConsumer() { + return cassandraTemplate -> cassandraTemplate.insert(pieDoe); } - */ - // TODO: Remove use of deprecation after Spring Data for Apache Cassandra issues are resolved! - @Override - protected List getStartupScripts() { + private Consumer assertKeyspaceNameCassandraTemplateConsumer() { - List startupScripts = new ArrayList<>(super.getStartupScripts()); + return cassandraTemplate -> { - startupScripts.addAll(readLines(new ClassPathResource(CASSANDRA_SCHEMA_CQL))); - startupScripts.addAll(readLines(new ClassPathResource(CASSANDRA_DATA_CQL))); + String resolvedKeyspaceName = Optional.of(cassandraTemplate.getCqlOperations()) + .filter(CqlTemplate.class::isInstance) + .map(CqlTemplate.class::cast) + .map(CqlTemplate::getSessionFactory) + .map(SessionFactory::getSession) + .flatMap(Session::getKeyspace) + .map(CqlIdentifier::toString) + .orElse(null); - return startupScripts; + assertThat(resolvedKeyspaceName).isEqualToIgnoringCase(KEYSPACE_NAME); + }; } - private @NonNull List readLines(@NonNull Resource resource) { + private Consumer assertTableNameCassandraTemplateConsumer() { + + return cassandraTemplate -> { - BufferedReader resourceReader = null; + String entityTableName = cassandraTemplate.getTableName(Customer.class).toString(); - try { + assertThat(entityTableName).endsWith(TABLE_NAME); + + Optional.of(cassandraTemplate.getCqlOperations()) + .filter(CqlTemplate.class::isInstance) + .map(CqlTemplate.class::cast) + .map(CqlTemplate::getSessionFactory) + .map(SessionFactory::getSession) + .map(Session::getMetadata) + .flatMap(metadata -> metadata.getKeyspace(KEYSPACE_NAME)) + .map(keyspaceMetadata -> keyspaceMetadata.getTable(entityTableName)) + .orElseThrow(() -> new IllegalStateException(String.format("Table [%s] not found", entityTableName))); + }; + } - resourceReader = new BufferedReader(new InputStreamReader(resource.getInputStream())); + @Bean + @Profile(DEBUGGING_PROFILE) + ApplicationListener populateCassandraDatabaseUsingRepository( + CustomerRepository customerRepository) { - return resourceReader.lines() - .filter(StringUtils::hasText) - .collect(Collectors.toList()); - } - catch (IOException cause) { - throw newRuntimeException(cause, "Failed to read from Resource [%s]", resource); - } - finally { - IOUtils.close(resourceReader); - } + return event -> customerRepository.save(pieDoe); } } diff --git a/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java b/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java index 1a928981b..336acc755 100644 --- a/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java +++ b/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java @@ -15,63 +15,163 @@ */ package example.app.crm.config; +import static org.assertj.core.api.Assertions.assertThat; + +import java.net.InetSocketAddress; +import java.util.Arrays; + +import com.datastax.oss.driver.api.core.CqlSession; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.cassandra.CassandraProperties; +import org.springframework.boot.autoconfigure.cassandra.CqlSessionBuilderCustomizer; +import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.core.env.Environment; +import org.springframework.data.cassandra.core.CassandraTemplate; +import org.springframework.lang.NonNull; +import org.testcontainers.containers.CassandraContainer; import org.testcontainers.containers.GenericContainer; +import example.app.crm.model.Customer; + /** * Spring {@link @Configuration} for Apache Cassandra using Testcontainers. * * @author John Blum + * @see java.net.InetSocketAddress + * @see com.datastax.oss.driver.api.core.CqlSession + * @see org.springframework.boot.autoconfigure.cassandra.CqlSessionBuilderCustomizer + * @see org.springframework.boot.autoconfigure.domain.EntityScan * @see org.springframework.context.annotation.Bean * @see org.springframework.context.annotation.Configuration * @see org.springframework.context.annotation.Profile + * @see org.testcontainers.containers.CassandraContainer * @see org.testcontainers.containers.GenericContainer * @since 1.1.0 */ @Configuration @Profile("inline-caching-cassandra") +@EntityScan(basePackageClasses = Customer.class) @SuppressWarnings("unused") public class TestcontainersCassandraConfiguration extends TestCassandraConfiguration { private static final String CASSANDRA_DOCKER_IMAGE_NAME = "cassandra:latest"; + private static final String LOCAL_DATACENTER_NAME = "datacenter1"; - @Bean - @SuppressWarnings("rawtypes") - GenericContainer cassandraContainer() { + @Bean("CassandraContainer") + GenericContainer cassandraContainer(Environment environment) { - GenericContainer cassandraContainer = newCustomCassandraContainer(); + GenericContainer cassandraContainer = newEnvironmentOptimizedCassandraContainer(); cassandraContainer.start(); - return cassandraContainer; + return withCassandraServer(cassandraContainer, environment); } - @SuppressWarnings("rawtypes") - private GenericContainer newCassandraContainer() { - return new GenericContainer(CASSANDRA_DOCKER_IMAGE_NAME) - .withExposedPorts(CASSANDRA_DEFAULT_PORT); + private @NonNull GenericContainer newCassandraContainer() { + + return new CassandraContainer<>(CASSANDRA_DOCKER_IMAGE_NAME) + .withInitScript(CASSANDRA_SCHEMA_CQL) + //.withInitScript(CASSANDRA_INIT_CQL) + .withExposedPorts(CASSANDRA_DEFAULT_PORT) + .withReuse(true); } - @SuppressWarnings("rawtypes") - private GenericContainer newCustomCassandraContainer() { + // Information (feedback) received from Sergei Egorov. + private @NonNull GenericContainer newEnvironmentOptimizedCassandraContainer() { return newCassandraContainer() + .withEnv("CASSANDRA_SNITCH", "GossipingPropertyFileSnitch") .withEnv("HEAP_NEWSIZE", "128M") .withEnv("MAX_HEAP_SIZE", "1024M") - .withEnv("JVM_OPTS", "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0") - .withEnv("CASSANDRA_SNITCH", "GossipingPropertyFileSnitch"); + .withEnv("JVM_OPTS", "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0"); + } + + private @NonNull CassandraTemplate newCassandraTemplate(@NonNull CqlSession session) { + return new CassandraTemplate(session); + } + + private @NonNull CqlSession newCqlSession(@NonNull GenericContainer cassandraContainer) { + + return CqlSession.builder() + .addContactPoint(resolveContactPoint(cassandraContainer)) + .withLocalDatacenter(LOCAL_DATACENTER_NAME) + .build(); + } + + private @NonNull GenericContainer withCassandraServer(@NonNull GenericContainer cassandraContainer, + @NonNull Environment environment) { + + if (Arrays.asList(environment.getActiveProfiles()).contains(DEBUGGING_PROFILE)) { + cassandraContainer = initializeCassandraServer(cassandraContainer); + cassandraContainer = assertCassandraServerSetup(cassandraContainer); + } + + return cassandraContainer; } - @Override - protected String getContactPoints() { - return cassandraContainer().getContainerIpAddress(); + private @NonNull GenericContainer initializeCassandraServer(@NonNull GenericContainer cassandraContainer) { + + try (CqlSession session = newCqlSession(cassandraContainer)) { + newKeyspacePopulator(newCassandraSchemaCqlScriptResource()).populate(session); + } + + return cassandraContainer; + } + + private @NonNull GenericContainer assertCassandraServerSetup(@NonNull GenericContainer cassandraContainer) { + + try (CqlSession session = newCqlSession(cassandraContainer)) { + + session.getMetadata().getKeyspace(KEYSPACE_NAME) + .map(keyspaceMetadata -> { + + assertThat(keyspaceMetadata.getName().toString()).isEqualToIgnoringCase(KEYSPACE_NAME); + + keyspaceMetadata.getTable(TABLE_NAME) + .map(tableMetadata -> { + + assertThat(tableMetadata.getName().toString()).isEqualTo(TABLE_NAME); + assertThat(tableMetadata.getKeyspace().toString()).isEqualToIgnoringCase(KEYSPACE_NAME); + //assertCustomersTableHasSizeOne(session); + + return tableMetadata; + }) + .orElseThrow(() -> new IllegalStateException(String.format("Table [%s] not found", TABLE_NAME))); + + return keyspaceMetadata; + }) + .orElseThrow(() -> new IllegalStateException(String.format("Keyspace [%s] not found", KEYSPACE_NAME))); + } + + return cassandraContainer; + } + + private void assertCustomersTableHasSizeOne(@NonNull CqlSession session) { + + CassandraTemplate template = newCassandraTemplate(session); + + assertThat(template.getCqlOperations().execute(String.format("USE %s;", KEYSPACE_NAME))).isTrue(); + assertThat(template.getCqlOperations().queryForObject("SELECT count(*) FROM \"Customers\"", Long.class)).isOne(); + //assertThat(template.count(Customer.class)).isOne(); // Table Customers not found; needs to use the Keyspace + } + + @Bean + CqlSessionBuilderCustomizer cqlSessionBuilderCustomizer(CassandraProperties properties, + @Qualifier("CassandraContainer") GenericContainer cassandraContainer) { + + return cqlSessionBuilder -> cqlSessionBuilder + .addContactPoint(resolveContactPoint(cassandraContainer)) + .withLocalDatacenter(properties.getLocalDatacenter()) + .withKeyspace(properties.getKeyspaceName()); } - @Override - protected int getPort() { - return cassandraContainer().getFirstMappedPort(); + private @NonNull InetSocketAddress resolveContactPoint(@NonNull GenericContainer cassandraContainer) { + return new InetSocketAddress(cassandraContainer.getHost(), + cassandraContainer.getMappedPort(CASSANDRA_DEFAULT_PORT)); } } diff --git a/spring-geode/src/test/java/example/app/crm/model/Customer.java b/spring-geode/src/test/java/example/app/crm/model/Customer.java index a0188c24f..f8c20183a 100644 --- a/spring-geode/src/test/java/example/app/crm/model/Customer.java +++ b/spring-geode/src/test/java/example/app/crm/model/Customer.java @@ -18,7 +18,6 @@ import javax.persistence.Entity; import javax.persistence.Table; -import org.springframework.data.annotation.Id; import org.springframework.data.cassandra.core.mapping.Indexed; import org.springframework.data.cassandra.core.mapping.PrimaryKey; import org.springframework.data.gemfire.mapping.annotation.Region; @@ -32,8 +31,11 @@ * The {@link Customer} class is an Abstract Data Type (ADT) modeling a customer. * * @author John Blum - * @see lombok - * @see org.springframework.data.annotation.Id + * @see javax.persistence.Entity + * @see javax.persistence.Table + * @see org.springframework.data.cassandra.core.mapping.Indexed + * @see org.springframework.data.cassandra.core.mapping.PrimaryKey + * @see org.springframework.data.cassandra.core.mapping.Table * @see org.springframework.data.gemfire.mapping.annotation.Region * @since 1.1.0 */ @@ -46,9 +48,8 @@ @AllArgsConstructor(staticName = "newCustomer") public class Customer { - @Id - @javax.persistence.Id @PrimaryKey + @javax.persistence.Id private Long id; @Indexed diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/inline/AbstractInlineCachingWithExternalDataSourceIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/inline/AbstractInlineCachingWithExternalDataSourceIntegrationTests.java index 4a6daddc0..6e9ab8f51 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/inline/AbstractInlineCachingWithExternalDataSourceIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/inline/AbstractInlineCachingWithExternalDataSourceIntegrationTests.java @@ -41,8 +41,6 @@ @SuppressWarnings("unused") public abstract class AbstractInlineCachingWithExternalDataSourceIntegrationTests extends IntegrationTestsSupport { - public static final String GEMFIRE_LOG_LEVEL = "off"; - @Autowired private CustomerRepository customerRepository; diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/inline/cassandra/InlineCachingWithCassandraIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/inline/cassandra/InlineCachingWithCassandraIntegrationTests.java index 3e34a0a31..071b47e22 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/inline/cassandra/InlineCachingWithCassandraIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/inline/cassandra/InlineCachingWithCassandraIntegrationTests.java @@ -23,7 +23,6 @@ import org.apache.geode.cache.client.ClientRegionShortcut; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; @@ -60,6 +59,7 @@ * @see org.springframework.geode.cache.inline.AbstractInlineCachingWithExternalDataSourceIntegrationTests * @see org.springframework.test.context.ActiveProfiles * @see org.springframework.test.context.junit4.SpringRunner + * @see example.app.crm.config.TestcontainersCassandraConfiguration * @since 1.1.0 */ @SpringBootTest @@ -69,8 +69,8 @@ public class InlineCachingWithCassandraIntegrationTests extends AbstractInlineCachingWithExternalDataSourceIntegrationTests { - @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, CassandraDataAutoConfiguration.class }) - @ClientCacheApplication(logLevel = GEMFIRE_LOG_LEVEL) + @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) + @ClientCacheApplication @EnableCassandraRepositories(basePackageClasses = CustomerRepository.class) @EnableEntityDefinedRegions(basePackageClasses = Customer.class, clientRegionShortcut = ClientRegionShortcut.LOCAL) @Import(TestcontainersCassandraConfiguration.class) diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/inline/database/InlineCachingWithDatabaseIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/inline/database/InlineCachingWithDatabaseIntegrationTests.java index b250d049d..d821f8795 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/inline/database/InlineCachingWithDatabaseIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/inline/database/InlineCachingWithDatabaseIntegrationTests.java @@ -68,7 +68,7 @@ public class InlineCachingWithDatabaseIntegrationTests extends AbstractInlineCachingWithExternalDataSourceIntegrationTests { @SpringBootApplication(exclude = { CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class }) - @ClientCacheApplication(logLevel = GEMFIRE_LOG_LEVEL) + @ClientCacheApplication @EntityScan(basePackageClasses = Customer.class) @EnableEntityDefinedRegions(basePackageClasses = Customer.class, clientRegionShortcut = ClientRegionShortcut.LOCAL) @EnableJpaRepositories(basePackageClasses = CustomerRepository.class) diff --git a/spring-geode/src/test/resources/application-inline-caching-cassandra.properties b/spring-geode/src/test/resources/application-inline-caching-cassandra.properties new file mode 100644 index 000000000..6f7ca3871 --- /dev/null +++ b/spring-geode/src/test/resources/application-inline-caching-cassandra.properties @@ -0,0 +1,5 @@ +# Spring Boot application.properties for Apache Cassandra configuration of Inline Caching + +spring.data.cassandra.keyspace-name=CustomerService +spring.data.cassandra.schema-action=recreate +spring.data.cassandra.local-datacenter=datacenter1 diff --git a/spring-geode/src/test/resources/application-inline-caching-database.properties b/spring-geode/src/test/resources/application-inline-caching-database.properties index 3516ffb25..06254c81f 100644 --- a/spring-geode/src/test/resources/application-inline-caching-database.properties +++ b/spring-geode/src/test/resources/application-inline-caching-database.properties @@ -1,4 +1,4 @@ -# RBMS (Database) configuration properties +# Spring Boot application.properties for RDBMS (Database) configuration of Inline Caching spring.jpa.show-sql=true spring.jpa.hibernate.ddl-auto=none diff --git a/spring-geode/src/test/resources/cassandra-data.cql b/spring-geode/src/test/resources/cassandra-data.cql index 9c64b2f20..2b682ebbd 100644 --- a/spring-geode/src/test/resources/cassandra-data.cql +++ b/spring-geode/src/test/resources/cassandra-data.cql @@ -1 +1 @@ -INSERT INTO customers (id, name) VALUES (16, 'Pie Doe'); +INSERT INTO "Customers" (id, name) VALUES (16, 'Pie Doe'); diff --git a/spring-geode/src/test/resources/cassandra-init.cql b/spring-geode/src/test/resources/cassandra-init.cql new file mode 100644 index 000000000..c0f63a65c --- /dev/null +++ b/spring-geode/src/test/resources/cassandra-init.cql @@ -0,0 +1,5 @@ +CREATE KEYSPACE IF NOT EXISTS CustomerService WITH replication = { 'class':'SimpleStrategy', 'replication_factor':1 }; +USE CustomerService; +CREATE TABLE IF NOT EXISTS "Customers" (id BIGINT PRIMARY KEY, name TEXT); +CREATE INDEX IF NOT EXISTS CustomerNameIdx ON "Customers"(name); +INSERT INTO "Customers" (id, name) VALUES (16, 'Pie Doe'); diff --git a/spring-geode/src/test/resources/cassandra-schema.cql b/spring-geode/src/test/resources/cassandra-schema.cql index 89ddcf174..80d7a04e4 100644 --- a/spring-geode/src/test/resources/cassandra-schema.cql +++ b/spring-geode/src/test/resources/cassandra-schema.cql @@ -1,4 +1,4 @@ CREATE KEYSPACE IF NOT EXISTS CustomerService WITH replication = { 'class':'SimpleStrategy', 'replication_factor':1 }; USE CustomerService; -CREATE TABLE IF NOT EXISTS customers (id BIGINT PRIMARY KEY, name TEXT); -CREATE INDEX IF NOT EXISTS CustomerNameIdx ON customers(name); +CREATE TABLE IF NOT EXISTS "Customers" (id BIGINT PRIMARY KEY, name TEXT); +CREATE INDEX IF NOT EXISTS CustomerNameIdx ON "Customers"(name); From 9dede1a7178ce514cbe46352b75713f20091a809 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 15:38:32 -0700 Subject: [PATCH 106/201] Upgrade Spring Geode Samples to Spring Boot 2.7.2-SNAPSHOT and SBDG 1.7.2-SNAPSHOT. --- spring-geode-samples/intro/getting-started/pom.xml | 2 +- spring-geode-samples/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-geode-samples/intro/getting-started/pom.xml b/spring-geode-samples/intro/getting-started/pom.xml index c32575d71..572e20a93 100644 --- a/spring-geode-samples/intro/getting-started/pom.xml +++ b/spring-geode-samples/intro/getting-started/pom.xml @@ -8,7 +8,7 @@ org.springframework.geode spring-geode-samples-parent - 1.7.1-SNAPSHOT + 1.7.2-SNAPSHOT ../../pom.xml diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index a46a3d3cd..04ec1a41a 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,13 +8,13 @@ org.springframework.boot spring-boot-starter-parent - 2.7.1 + 2.7.2-SNAPSHOT org.springframework.geode spring-geode-samples-parent - 1.7.1-SNAPSHOT + 1.7.2-SNAPSHOT pom Spring Geode Samples Parent @@ -42,19 +42,19 @@ org.springframework.geode spring-geode-starter - 1.7.1-SNAPSHOT + 1.7.2-SNAPSHOT org.springframework.geode spring-geode-starter-logging - 1.7.1-SNAPSHOT + 1.7.2-SNAPSHOT org.springframework.geode spring-geode-starter-test - 1.7.1-SNAPSHOT + 1.7.2-SNAPSHOT From 2e9d57704b51bf4d96b2242d29d0c0fe5317fc45 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 15:39:00 -0700 Subject: [PATCH 107/201] Upgrade to VMware Tanzu (Pivotal) GemFire 9.10.16. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2a668297c..01676a179 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ awaitilityVersion=4.2.0 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 -pivotalGemFireVersion=9.10.15 +pivotalGemFireVersion=9.10.16 springVersion=5.3.21 springBootVersion=2.7.2-SNAPSHOT springCloudBindingsVersion=1.8.1 From 83ab6a1c99e8ecd673ef45d8e271d830dc646bd9 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 15:40:02 -0700 Subject: [PATCH 108/201] Upgrade to Spring Framework 5.3.22. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 01676a179..602673dcd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.16 -springVersion=5.3.21 +springVersion=5.3.22 springBootVersion=2.7.2-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.1 From c6b5d53cb4c9f5b6c77b8412d9800baf870206e1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 15:40:35 -0700 Subject: [PATCH 109/201] Upgrade to Spring Boot 2.7.2. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 602673dcd..c5d637dc9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.16 springVersion=5.3.22 -springBootVersion=2.7.2-SNAPSHOT +springBootVersion=2.7.2 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.1 springDataGeodeVersion=2.7.1 From 3e8ef607af62e29c798a559a429f32e7c23d9abb Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 15:41:34 -0700 Subject: [PATCH 110/201] Upgrade to Spring Data BOM 2021.2.2 (Raj-SR2). --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c5d637dc9..afe8bcd37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.16 springVersion=5.3.22 springBootVersion=2.7.2 springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.1 +springDataBomVersion=2021.2.2 springDataGeodeVersion=2.7.1 springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0 From a275c761d8c2e0b49515a9c09a82a62009997d4d Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 15:41:55 -0700 Subject: [PATCH 111/201] Upgrade to Spring Data for Apache Geode 2.7.2. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index afe8bcd37..605c234b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.22 springBootVersion=2.7.2 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.2 -springDataGeodeVersion=2.7.1 +springDataGeodeVersion=2.7.2 springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 From 5476c49cd5c8f6ad4114b2cc2a8c4fbc3a4f08ad Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 15:43:37 -0700 Subject: [PATCH 112/201] Upgrade to Testcontainers 1.17.3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 605c234b1..61da2133d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE -testcontainersVersion=1.17.2 +testcontainersVersion=1.17.3 version=1.7.2-SNAPSHOT From 1a6308e4fdd31b976c68950e8d8dee967782e148 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 16:53:02 -0700 Subject: [PATCH 113/201] Edit changelog and include 1.6.10 release notes. --- spring-geode/src/main/resources/changelog.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index bda7ceb15..bbf9a8ef1 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,21 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.10 (2022-07-21) +-------------------------------------- +Aligns SBDG with Spring Boot 2.6.10. + +* Built with Oracle Java 8, JDK 1.8.0_331. +* Improves the spring-geode-starter-logging by providing better integration with Spring Boot logging along with +modularizing the SLF4j, Logback configuration allowing users to customize per component, such as Apache Geode component +logging independent of Spring Boot and Spring components, offering finer grain control. +* Upgrades to Spring Framework 5.3.22. +* Upgrades to Spring Boot 2.6.10. +* Upgrades to Spring Data BOM 2021.1.6 (Q-SR6). +* Upgrades to Spring Data for Apache Geode 2.6.6. +* Upgrades to Testcontainers 1.17.3 + + Changes in version 1.7.1 (2022-06-24) ------------------------------------- Aligns SBDG with Spring Boot 2.7.1 From 460b8ab641f46b732381a65d15b1de773ad9ad3a Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 16:53:50 -0700 Subject: [PATCH 114/201] Edit README to refer to SBDG 1.6.10 and 1.6.11-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index eef3b033a..1c88d5ff0 100644 --- a/README.adoc +++ b/README.adoc @@ -75,8 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.2-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.10-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.9`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] +| `1.6.11-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.10`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] |=== From 507f59afd66f5fe78498328b999b799ec42a8d70 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 17:08:24 -0700 Subject: [PATCH 115/201] Upgrade Spring Geode Samples to Spring Boot 2.7.2. --- spring-geode-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index 04ec1a41a..f21bd9518 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.2-SNAPSHOT + 2.7.2 From 3e9bf3b12b879f514b55ebde6d7e7477f31a08d0 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 16:55:51 -0700 Subject: [PATCH 116/201] Edit changelog and add 1.7.2 release notes. --- spring-geode/src/main/resources/changelog.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index bbf9a8ef1..25fc8589e 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,22 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.7.2 (2022-07-21) +------------------------------------- +Aligns SBDG with Spring Boot 2.7.2. + +* Built with Oracle Java 8, JDK 1.8.0_331. +* Improves the spring-geode-starter-logging by providing better integration with Spring Boot logging along with +modularizing the SLF4j, Logback configuration allowing users to customize per component, such as Apache Geode component +logging independent of Spring Boot and Spring components, offering finer grain control. +* Upgrades to Spring Framework 5.3.22. +* Upgrades to Spring Boot 2.7.2 +* Upgrades to Spring Data BOM 2021.2.2 (Raj-SR2). +* Upgrades to Spring Data for Apache Geode 2.7.2 +* Upgrades to Testcontainers 1.17.3 +* Upgrades to VMware Tanzu (Pivotal) GemFire 9.10.16. + + Changes in version 1.6.10 (2022-07-21) -------------------------------------- Aligns SBDG with Spring Boot 2.6.10. From c8e61a1f795a4186e8d33eb544f949df817e9e8a Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 17:10:39 -0700 Subject: [PATCH 117/201] Release 1.7.2. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 61da2133d..42de6e9a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.3 -version=1.7.2-SNAPSHOT +version=1.7.2 From 6a98f495d3edc180209330276dd846539a83b669 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 17:35:54 -0700 Subject: [PATCH 118/201] Prepare next development iteration. Set Spring Boot version to 2.7.3-SNAPSHOT. Set version to 1.7.3-SNAPSHOT. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 42de6e9a5..ee744a4f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.16 springVersion=5.3.22 -springBootVersion=2.7.2 +springBootVersion=2.7.3-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.2 springDataGeodeVersion=2.7.2 @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.3 -version=1.7.2 +version=1.7.3-SNAPSHOT From e1c87e9eb0d152e6601a1001ea16784cfa4dde97 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Jul 2022 17:54:21 -0700 Subject: [PATCH 119/201] Edit README to refer to Spring Boot 2.7.2 and SBDG 1.7.2. --- README.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 1c88d5ff0..64781f7b5 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ :spring-docs: https://docs.spring.io/spring-framework/docs/current/reference/html/ :sbdg-docs: https://docs.spring.io/spring-boot-data-geode-build/current/reference/html5/ :sbdg-javadoc: https://docs.spring.io/spring-boot-data-geode-build/current/api/ -:sbdg-version: 1.7.1 -:spring-boot-version: 2.7.1 +:sbdg-version: 1.7.2 +:spring-boot-version: 2.7.2 :geode-javadoc: https://geode.apache.org/releases/latest/javadoc :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire @@ -73,8 +73,8 @@ The following SBDG versions are currently maintained and developed. | Version | Reference Documentation | Javadoc | Samples | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] -| `1.7.2-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.7.1`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] +| `1.7.3-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.7.2`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.11-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.10`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] From eb674d87b1e28393d070c6c8f96f9b7fe95e375f Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 22 Jul 2022 12:28:56 -0700 Subject: [PATCH 120/201] Edit Javadoc in the EnableClusterAware annotation. --- .../geode/config/annotation/EnableClusterAware.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java index 843b0e75b..77cf465f2 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java @@ -56,17 +56,17 @@ * before the cluster aware logic considers that a cluster actually exists. * * Previously, in cloud-managed environments (e.g. VMware Tanzu Application Service (TAS) for VMs, formerly known as - * Pivotal Platform or Pivotal CloudFoundry (PCF), or Kubernetes, known as VMware Tanzu Application Service for K8S) + * Pivotal Platform or Pivotal CloudFoundry (PCF), or Kubernetes, known as VMware Tanzu Application Platform for K8S) * it was assumed that a cluster would be provisioned and available, and that the Spring Boot, Apache Geode * {@link ClientCache} application would connect to the cluster on deployment (push). * * However, is entirely possible that users may push Spring Boot, Apache Geode {@link ClientCache} applications - * to a cloud-managed environment where not cluster was provisioned and is available, and user simply want their + * to a cloud-managed environment where no cluster was provisioned and is available, and users simply want their * apps to run in local-only mode. * - * The strict match configuration setting absolutely requires that at least 1 connection must be established. Use - * of this configuration setting also promotes a fail-fast protocol, or at least early detection (when log levels - * are adjusted accordingly) that a cluster is not available. + * The strict match configuration setting absolutely requires at least 1 connection must be established. Use of this + * configuration setting also promotes a fail-fast protocol, or at least early detection (when log levels are + * adjusted accordingly) that a cluster is not available. * * Use {@literal spring.boot.data.gemfire.cluster.condition.match.strict} * in Spring Boot {@literal application.properties}. From 38020cca3c6710f82d1ae470c5cd84de126e1082 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 22 Jul 2022 12:34:15 -0700 Subject: [PATCH 121/201] Set SD Cassandra Schema Action to 'none' in the Inline Caching with Apache Cassandra Integration Tests. --- .../resources/application-inline-caching-cassandra.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode/src/test/resources/application-inline-caching-cassandra.properties b/spring-geode/src/test/resources/application-inline-caching-cassandra.properties index 6f7ca3871..de2c50084 100644 --- a/spring-geode/src/test/resources/application-inline-caching-cassandra.properties +++ b/spring-geode/src/test/resources/application-inline-caching-cassandra.properties @@ -1,5 +1,5 @@ # Spring Boot application.properties for Apache Cassandra configuration of Inline Caching spring.data.cassandra.keyspace-name=CustomerService -spring.data.cassandra.schema-action=recreate spring.data.cassandra.local-datacenter=datacenter1 +spring.data.cassandra.schema-action=none From 687eb7f6e48088033c27ae797b8fc3921f9c2237 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 26 Aug 2022 13:05:15 -0700 Subject: [PATCH 122/201] Edit changelog and include 1.6.11 release notes. --- spring-geode/src/main/resources/changelog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 25fc8589e..a16d5dad9 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,15 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.11 (2022-08-26) +-------------------------------------- +Aligns SBDG with Spring Boot 2.6.11. + +* Built with Oracle Java 8, JDK 1.8.0_331. +* Upgrades to Spring Boot 2.6.11. +* Upgrades to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.14.5. + + Changes in version 1.7.2 (2022-07-21) ------------------------------------- Aligns SBDG with Spring Boot 2.7.2. From cc58490476976732a51b37db2fe73ecf81d60ede Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 26 Aug 2022 13:05:48 -0700 Subject: [PATCH 123/201] Edit README to refer to SBDG 1.6.11 release and 1.6.12-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 64781f7b5..3234f3edb 100644 --- a/README.adoc +++ b/README.adoc @@ -75,8 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.3-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.2`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.11-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.10`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] +| `1.6.12-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.11`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] |=== From f486db6d46ed90724b61411ea602d38809d0861e Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 26 Aug 2022 13:07:41 -0700 Subject: [PATCH 124/201] Upgrade to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.14.5. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ee744a4f7..62ca758b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ apacheGeodeVersion=1.14.4 awaitilityVersion=4.2.0 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 -pivotalCloudCacheVersion=1.14.4 +pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.16 springVersion=5.3.22 springBootVersion=2.7.3-SNAPSHOT From 5e312b7675d6acfa199084aaaeb67ab0e1961a26 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 26 Aug 2022 13:08:26 -0700 Subject: [PATCH 125/201] Upgrade to Spring Boot 2.7.3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 62ca758b1..d87966a0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.16 springVersion=5.3.22 -springBootVersion=2.7.3-SNAPSHOT +springBootVersion=2.7.3 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.2 springDataGeodeVersion=2.7.2 From 2220722ed5e01572c4138cc29b1d04035dd8d9ea Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 26 Aug 2022 13:21:11 -0700 Subject: [PATCH 126/201] Upgrade Spring Geode Samples to Spring Boot 2.7.3 and SBDG 1.7.3-SNAPSHOT. --- spring-geode-samples/intro/getting-started/pom.xml | 2 +- spring-geode-samples/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-geode-samples/intro/getting-started/pom.xml b/spring-geode-samples/intro/getting-started/pom.xml index 572e20a93..f2355d16d 100644 --- a/spring-geode-samples/intro/getting-started/pom.xml +++ b/spring-geode-samples/intro/getting-started/pom.xml @@ -8,7 +8,7 @@ org.springframework.geode spring-geode-samples-parent - 1.7.2-SNAPSHOT + 1.7.3-SNAPSHOT ../../pom.xml diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index f21bd9518..5785ec18b 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,13 +8,13 @@ org.springframework.boot spring-boot-starter-parent - 2.7.2 + 2.7.3 org.springframework.geode spring-geode-samples-parent - 1.7.2-SNAPSHOT + 1.7.3-SNAPSHOT pom Spring Geode Samples Parent @@ -42,19 +42,19 @@ org.springframework.geode spring-geode-starter - 1.7.2-SNAPSHOT + 1.7.3-SNAPSHOT org.springframework.geode spring-geode-starter-logging - 1.7.2-SNAPSHOT + 1.7.3-SNAPSHOT org.springframework.geode spring-geode-starter-test - 1.7.2-SNAPSHOT + 1.7.3-SNAPSHOT From 831e8fe1b519c4e3c88d1d535caab6be90b64b3e Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 26 Aug 2022 13:21:23 -0700 Subject: [PATCH 127/201] Edit changelog and add 1.7.3 release notes. --- spring-geode/src/main/resources/changelog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index a16d5dad9..d24c4c3be 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,15 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.7.3 (2022-08-26) +------------------------------------- +Aligns SBDG with Spring Boot 2.7.3. + +* Built with Oracle Java 8, JDK 1.8.0_331. +* Upgrades to Spring Boot 2.7.3. +* Upgrades to VMware Tanzu GemFire for VMs (Pivotal Cloud Cache) 1.14.5. + + Changes in version 1.6.11 (2022-08-26) -------------------------------------- Aligns SBDG with Spring Boot 2.6.11. From b5808be4c9dd736ea4f39680827696a53118c6ba Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 26 Aug 2022 13:22:46 -0700 Subject: [PATCH 128/201] Release 1.7.3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d87966a0b..4a39e2704 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.3 -version=1.7.3-SNAPSHOT +version=1.7.3 From 732fa0070eae44043615845743870439c3932464 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 26 Aug 2022 13:41:39 -0700 Subject: [PATCH 129/201] Prepare next development iteration. Set Spring Boot version to 2.7.4-SNAPSHOT. Set version to 1.7.4-SNAPSHOT. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4a39e2704..8646ce0be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.16 springVersion=5.3.22 -springBootVersion=2.7.3 +springBootVersion=2.7.4-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.2 springDataGeodeVersion=2.7.2 @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.3 -version=1.7.3 +version=1.7.4-SNAPSHOT From 00b8182b00fc1fcfaad699b6a43d0e2e90bfd367 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 26 Aug 2022 14:06:38 -0700 Subject: [PATCH 130/201] Edit README to refer to Spring Boot 2.7.3 and SBDG 1.7.3 releases. --- README.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 3234f3edb..6c88a100f 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ :spring-docs: https://docs.spring.io/spring-framework/docs/current/reference/html/ :sbdg-docs: https://docs.spring.io/spring-boot-data-geode-build/current/reference/html5/ :sbdg-javadoc: https://docs.spring.io/spring-boot-data-geode-build/current/api/ -:sbdg-version: 1.7.2 -:spring-boot-version: 2.7.2 +:sbdg-version: 1.7.3 +:spring-boot-version: 2.7.3 :geode-javadoc: https://geode.apache.org/releases/latest/javadoc :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire @@ -73,8 +73,8 @@ The following SBDG versions are currently maintained and developed. | Version | Reference Documentation | Javadoc | Samples | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] -| `1.7.3-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.7.2`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] +| `1.7.4-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.7.3`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.12-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.11`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] From 776433245f89bb0af003bce89c475d80fcb69db4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 17:03:51 -0700 Subject: [PATCH 131/201] Upgrade to Spring Framework 5.3.23. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8646ce0be..9f06e8fd6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.16 -springVersion=5.3.22 +springVersion=5.3.23 springBootVersion=2.7.4-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.2 From b7c8117c10ca7d3b8936d465e9dade17187fa517 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 17:04:21 -0700 Subject: [PATCH 132/201] Upgrade to Spring Boot 2.7.4. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9f06e8fd6..183847325 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.16 springVersion=5.3.23 -springBootVersion=2.7.4-SNAPSHOT +springBootVersion=2.7.4 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.2 springDataGeodeVersion=2.7.2 From e31d1f58db6fa0b9bf50a97462a827fd4482a535 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 17:06:38 -0700 Subject: [PATCH 133/201] Upgrade to Spring Data BOM 2021.2.3 (Raj-SR3). --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 183847325..51d18338d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.16 springVersion=5.3.23 springBootVersion=2.7.4 springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.2 +springDataBomVersion=2021.2.3 springDataGeodeVersion=2.7.2 springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0 From 85cc42014f3f7c1d1636f8ae2ab5a9fa30a54aa0 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 17:07:00 -0700 Subject: [PATCH 134/201] Upgrade to Spring Data for Apache Geode 2.7.3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 51d18338d..b35957d51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.23 springBootVersion=2.7.4 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.3 -springDataGeodeVersion=2.7.2 +springDataGeodeVersion=2.7.3 springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.0 From 814312c4043a48a09a14f4b57f16b6a24b47d158 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 17:07:40 -0700 Subject: [PATCH 135/201] Upgrade to Spring Session for Apache Geode 2.7.1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b35957d51..cc06f8234 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ springDataBomVersion=2021.2.3 springDataGeodeVersion=2.7.3 springDataGeodeTestVersion=0.3.0-RAJ springSessionBomVersion=2021.2.0 -springSessionDataGeodeVersion=2.7.0 +springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.3 version=1.7.4-SNAPSHOT From d62bd8ced476e69330b13593428d5902974e42ff Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 17:08:53 -0700 Subject: [PATCH 136/201] Upgrade to Spring Test for Apache Geode 0.3.1-RAJ. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cc06f8234..076017275 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ springBootVersion=2.7.4 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.3 springDataGeodeVersion=2.7.3 -springDataGeodeTestVersion=0.3.0-RAJ +springDataGeodeTestVersion=0.3.1-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE From a491713a047ebff42a5a84b8c6f699930597b4be Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 19:03:55 -0700 Subject: [PATCH 137/201] Edit changelog and include 1.6.12 release notes. --- spring-geode/src/main/resources/changelog.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index d24c4c3be..19cff3c76 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,19 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.12 (2022-09-23) +-------------------------------------- +Aligns SBDG with Spring Boot 2.6.12. + +* Built with Oracle Java 8, JDK 1.8.0_341. +* Upgrades to Spring Framework 5.3.23. +* Upgrades to Spring Boot 2.6.12. +* Upgrades to Spring Data BOM 2021.1.7 (Q-SR7). +* Upgrades to Spring Data for Apache Geode 2.6.7. +* Upgrades to Spring Session for Apache Geode 2.6.2. +* Upgrades to Spring Test for Apache Geode 0.2.3-Q. + + Changes in version 1.7.3 (2022-08-26) ------------------------------------- Aligns SBDG with Spring Boot 2.7.3. From 486f9ac2ad847df7a6e054f29e18386c3ff6f2d4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 19:10:15 -0700 Subject: [PATCH 138/201] Adapt to API changes in Spring Data for Apache Geode. --- .../ClientSecurityAutoConfiguration.java | 14 ++++---------- .../RegionTemplateAutoConfiguration.java | 7 +++---- .../SecurityManagerProxyConfiguration.java | 9 +++++++-- ...reshableAnnotationConfigApplicationContext.java | 9 ++++----- .../geode/core/util/SpringExtensions.java | 3 ++- .../security/support/SecurityManagerProxy.java | 5 +++++ 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java index 282c91e96..3fbbcccdc 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java @@ -23,6 +23,8 @@ import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -36,22 +38,17 @@ import org.springframework.boot.cloud.CloudPlatform; import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.context.annotation.Conditional; -import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; import org.springframework.core.env.PropertySource; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; import org.springframework.data.gemfire.config.annotation.EnableSecurity; -import org.springframework.data.gemfire.config.annotation.support.AutoConfiguredAuthenticationInitializer; import org.springframework.geode.core.env.VcapPropertySource; import org.springframework.geode.core.env.support.CloudCacheService; import org.springframework.geode.core.env.support.User; import org.springframework.lang.Nullable; import org.springframework.util.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Spring Boot {@link EnableAutoConfiguration auto-configuration} enabling Apache Geode's Security functionality, * and specifically Authentication between a client and server using Spring Data Geode Security annotations. @@ -113,11 +110,8 @@ public class ClientSecurityAutoConfiguration { private static final String POOL_LOCATORS_PROPERTY = "spring.data.gemfire.pool.locators"; - private static final String SECURITY_USERNAME_PROPERTY = - AutoConfiguredAuthenticationInitializer.SDG_SECURITY_USERNAME_PROPERTY; - - private static final String SECURITY_PASSWORD_PROPERTY = - AutoConfiguredAuthenticationInitializer.SDG_SECURITY_PASSWORD_PROPERTY; + private static final String SECURITY_USERNAME_PROPERTY = "spring.data.gemfire.security.username"; + private static final String SECURITY_PASSWORD_PROPERTY = "spring.data.gemfire.security.password"; private static final String SSL_USE_DEFAULT_CONTEXT_PROPERTY = "spring.data.gemfire.security.ssl.use-default-context"; diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java index c24b823c5..fbdd5e37a 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java @@ -47,7 +47,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.EventListener; import org.springframework.core.type.StandardMethodMetadata; @@ -58,8 +57,8 @@ import org.springframework.data.gemfire.config.xml.GemfireConstants; import org.springframework.data.gemfire.util.ArrayUtils; import org.springframework.data.gemfire.util.CollectionUtils; -import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.geode.config.annotation.support.TypelessAnnotationConfigSupport; +import org.springframework.geode.core.util.SpringExtensions; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.util.StringUtils; @@ -137,7 +136,7 @@ else if (isGemfireTemplateBeanDefinition(resolvedBeanType)) { userRegionTemplateNames.add(beanName); } else if (isBeanWithGemfireTemplateDependency(beanFactory, beanDefinition)) { - SpringUtils.addDependsOn(beanDefinition, GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME); + SpringExtensions.addDependsOn(beanDefinition, GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME); } } } @@ -213,7 +212,7 @@ private void setAutoConfiguredRegionTemplateDependencies(BeanDefinitionRegistry this.autoConfiguredRegionTemplateBeanNames.stream() .map(registry::getBeanDefinition) - .forEach(beanDefinition -> SpringUtils.addDependsOn(beanDefinition, dependencyBeanNamesArray)); + .forEach(beanDefinition -> SpringExtensions.addDependsOn(beanDefinition, dependencyBeanNamesArray)); } // Required by @EnableClusterDefinedRegions & Native-Defined Regions (e.g. Regions defined in "cache.xml"). diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java index d6facfbc4..0ab90daaa 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java @@ -17,6 +17,9 @@ import java.util.Properties; +import org.apache.geode.cache.Cache; + +import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.ContextRefreshedEvent; @@ -46,9 +49,11 @@ public class SecurityManagerProxyConfiguration implements ApplicationListener Date: Fri, 23 Sep 2022 23:18:01 -0700 Subject: [PATCH 139/201] Upgrade Spring Geode Samples to Spring Boot 2.7.4 and SBDG 1.7.4-SNAPSHOT. --- spring-geode-samples/intro/getting-started/pom.xml | 2 +- spring-geode-samples/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-geode-samples/intro/getting-started/pom.xml b/spring-geode-samples/intro/getting-started/pom.xml index f2355d16d..967711fc5 100644 --- a/spring-geode-samples/intro/getting-started/pom.xml +++ b/spring-geode-samples/intro/getting-started/pom.xml @@ -8,7 +8,7 @@ org.springframework.geode spring-geode-samples-parent - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT ../../pom.xml diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index 5785ec18b..2e9446a55 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,13 +8,13 @@ org.springframework.boot spring-boot-starter-parent - 2.7.3 + 2.7.4 org.springframework.geode spring-geode-samples-parent - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT pom Spring Geode Samples Parent @@ -42,19 +42,19 @@ org.springframework.geode spring-geode-starter - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT org.springframework.geode spring-geode-starter-logging - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT org.springframework.geode spring-geode-starter-test - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT From ef97333d11d787a69c3f4650b257d92578a07579 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 23:19:58 -0700 Subject: [PATCH 140/201] Edit changelog and add 1.7.4 release notes. --- spring-geode/src/main/resources/changelog.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 19cff3c76..3a5565b97 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,19 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.7.4 (2022-09-23) +------------------------------------- +Aligns SBDG with Spring Boot 2.7.4 + +* Built with Oracle Java 8, JDK 1.8.0_341. +* Upgrades to Spring Framework 5.3.23. +* Upgrades to Spring Boot 2.7.4. +* Upgrades to Spring Data BOM 2021.2.3 (Raj-SR3). +* Upgrades to Spring Data for Apache Geode 2.7.3. +* Upgrades to Spring Session for Apache Geode 2.7.1. +* Upgrades to Spring Test for Apache Geode 0.3.1-RAJ. + + Changes in version 1.6.12 (2022-09-23) -------------------------------------- Aligns SBDG with Spring Boot 2.6.12. From d540c8fbd71116b5f665d6ab9eac0b97da74f90a Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 23:21:39 -0700 Subject: [PATCH 141/201] Release 1.7.4. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 076017275..9320fe805 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.3 -version=1.7.4-SNAPSHOT +version=1.7.4 From adaf2995894f434bee7d9f100351fc0d981a2716 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 23:33:30 -0700 Subject: [PATCH 142/201] Prepare next development iteration. Set Spring Boot version to 2.7.5-SNAPSHOT. Set version to 1.7.5-SNAPSHOT. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9320fe805..148e3efec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.16 springVersion=5.3.23 -springBootVersion=2.7.4 +springBootVersion=2.7.5-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.3 springDataGeodeVersion=2.7.3 @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.3 -version=1.7.4 +version=1.7.5-SNAPSHOT From 9df8847541b3bc203bd4e7e2d101b722504c2bed Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 23:52:59 -0700 Subject: [PATCH 143/201] Edit README to refer to 1.6.12 release and 1.6.13-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 6c88a100f..3d497768b 100644 --- a/README.adoc +++ b/README.adoc @@ -75,8 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.4-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.3`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.12-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.11`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] +| `1.6.13-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.12`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] |=== From e135083920267b0de7607b72f9ea9ba5120f1d8f Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 23 Sep 2022 23:53:43 -0700 Subject: [PATCH 144/201] Edit README to refer to 1.7.4 release and 1.7.5-SNAPSHOT. Refer to Spring Boot 2.7.4 on Spring Initializer at start.spring.io. --- README.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 3d497768b..44227835e 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ :spring-docs: https://docs.spring.io/spring-framework/docs/current/reference/html/ :sbdg-docs: https://docs.spring.io/spring-boot-data-geode-build/current/reference/html5/ :sbdg-javadoc: https://docs.spring.io/spring-boot-data-geode-build/current/api/ -:sbdg-version: 1.7.3 -:spring-boot-version: 2.7.3 +:sbdg-version: 1.7.4 +:spring-boot-version: 2.7.4 :geode-javadoc: https://geode.apache.org/releases/latest/javadoc :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire @@ -73,8 +73,8 @@ The following SBDG versions are currently maintained and developed. | Version | Reference Documentation | Javadoc | Samples | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] -| `1.7.4-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.7.3`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] +| `1.7.5-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.7.4`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.13-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.12`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] From 77eb15e591d78528b452bad78f8e43b7f313a79f Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 28 Sep 2022 11:45:35 -0700 Subject: [PATCH 145/201] Exclude the Spring Gradle docbook-reference-plugin from Spring Build Conventions Gradle Plugins during reference documentation generation. --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fecd12d3b..dc2facd26 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,9 @@ buildscript { } } dependencies { - classpath 'io.spring.gradle:spring-build-conventions:0.0.38' + classpath('io.spring.gradle:spring-build-conventions:0.0.38') { + exclude group: "io.spring.gradle", module: "docbook-reference-plugin" + } classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } } From 78b2a02c36ee873b11dc76c346fb8a45de8c9866 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 5 Oct 2022 12:23:18 -0700 Subject: [PATCH 146/201] Refactor the spring-geode-starter-logging module. --- .../spring-geode-starter-logging.gradle | 1 + .../slf4j/logback/support/LogbackSupport.java | 67 +++- .../AbstractLoggingIntegrationTests.java | 289 ++++++++++++++---- .../logback/DebugLoggingIntegrationTests.java | 23 +- .../logback/ErrorLoggingIntegrationTests.java | 52 ++++ .../logback/InfoLoggingIntegrationTests.java | 21 +- .../logback/NoLoggingIntegrationTests.java | 20 +- 7 files changed, 367 insertions(+), 106 deletions(-) create mode 100644 spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/ErrorLoggingIntegrationTests.java diff --git a/spring-geode-starter-logging/spring-geode-starter-logging.gradle b/spring-geode-starter-logging/spring-geode-starter-logging.gradle index 7b61189db..50b663166 100644 --- a/spring-geode-starter-logging/spring-geode-starter-logging.gradle +++ b/spring-geode-starter-logging/spring-geode-starter-logging.gradle @@ -9,6 +9,7 @@ dependencies { compile "org.springframework.boot:spring-boot-starter-logging" implementation "org.codehaus.janino:janino" + implementation "org.springframework:spring-core" testImplementation project(":spring-geode-starter-test") diff --git a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/support/LogbackSupport.java b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/support/LogbackSupport.java index 4078bff1e..0d18cdcd2 100644 --- a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/support/LogbackSupport.java +++ b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/support/LogbackSupport.java @@ -20,10 +20,11 @@ import java.util.Optional; import java.util.function.Function; +import org.springframework.util.ClassUtils; + import org.slf4j.ILoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.impl.StaticLoggerBinder; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; @@ -43,6 +44,13 @@ @SuppressWarnings("unused") public abstract class LogbackSupport { + private static final Class LOGBACK_LOGGER_TYPE = ch.qos.logback.classic.Logger.class; + + private static final String STATIC_LOGGER_BINDER_CLASSNAME = "org.slf4j.impl.StaticLoggerBinder"; + + private static final boolean STATIC_LOGGER_BINDER_CLASS_PRESENT = + ClassUtils.isPresent(STATIC_LOGGER_BINDER_CLASSNAME, ClassUtils.getDefaultClassLoader()); + protected static final Function> slf4jLoggerToLogbackLoggerConverter = logger -> Optional.ofNullable(logger) .filter(ch.qos.logback.classic.Logger.class::isInstance) @@ -69,26 +77,59 @@ public static void suppressSpringBootLogbackInitialization() { requireLoggerContext().putObject(SPRING_BOOT_LOGGING_SYSTEM_CLASS_NAME, new Object()); } + /** + * Properly stops Logback classic. + * + * @see Stopping logback-classic + */ + public static void stopLogback() { + resolveLoggerContext() + .ifPresent(LoggerContext::stop); + } + /** * Resets the state of the SLF4J Logback logging provider and system. */ public static void resetLogback() { try { + resetLoggerContext(); + resetLoggerFactory(); + resetStaticLoggerBinder(); + } + catch (Throwable cause) { + throw new IllegalStateException("Failed to reset Logback", cause); + } + } + + private static void resetLoggerContext() { + + resolveLoggerContext().ifPresent(loggerContext -> { + loggerContext.reset(); + loggerContext.getStatusManager().clear(); + }); + } - Method loggerFactoryReset = LoggerFactory.class.getDeclaredMethod("reset"); + private static void resetLoggerFactory() throws Exception { + + Method loggerFactoryReset = LoggerFactory.class.getDeclaredMethod("reset"); + + loggerFactoryReset.setAccessible(true); + loggerFactoryReset.invoke(null); + } - loggerFactoryReset.setAccessible(true); - loggerFactoryReset.invoke(null); + private static void resetStaticLoggerBinder() throws Exception { - Method staticLoggerBinderReset = StaticLoggerBinder.class.getDeclaredMethod("reset"); + if (STATIC_LOGGER_BINDER_CLASS_PRESENT) { + + Class staticLoggerBinderClass = + ClassUtils.forName(STATIC_LOGGER_BINDER_CLASSNAME, ClassUtils.getDefaultClassLoader()); + + Method staticLoggerBinderReset = staticLoggerBinderClass.getDeclaredMethod("reset"); staticLoggerBinderReset.setAccessible(true); staticLoggerBinderReset.invoke(null); } - catch (Throwable cause) { - throw new IllegalStateException("Failed to reset Logback", cause); - } } /** @@ -146,10 +187,10 @@ public static Optional resolveRootLogger() { public static ch.qos.logback.classic.Logger requireLogbackRootLogger() { return resolveRootLogger() - .filter(ch.qos.logback.classic.Logger.class::isInstance) - .map(ch.qos.logback.classic.Logger.class::cast) + .filter(LOGBACK_LOGGER_TYPE::isInstance) + .map(LOGBACK_LOGGER_TYPE::cast) .orElseThrow(() -> new IllegalStateException(String.format(ILLEGAL_LOGGER_TYPE_EXCEPTION_MESSAGE, - ROOT_LOGGER_NAME, nullSafeTypeName(resolveRootLogger())))); + ROOT_LOGGER_NAME, nullSafeTypeName(resolveRootLogger().orElse(null))))); } /** @@ -166,7 +207,7 @@ public static ch.qos.logback.classic.Logger requireLogbackRootLogger() { * @see org.slf4j.Logger */ public static > Optional resolveAppender(ch.qos.logback.classic.Logger logger, - String appenderName, Class appenderType) { + String appenderName, Class appenderType) { appenderType = nullSafeAppenderType(appenderType); @@ -192,7 +233,7 @@ public static > Optional resolveAppender(ch.qos.logb * @see ch.qos.logback.core.Appender */ public static > T requireAppender(ch.qos.logback.classic.Logger logger, - String appenderName, Class appenderType) { + String appenderName, Class appenderType) { return resolveAppender(logger, appenderName, appenderType) .orElseThrow(() -> new IllegalStateException(String.format(UNRESOLVABLE_APPENDER_EXCEPTION_MESSAGE, diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java index 710da3dac..4559057dc 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java @@ -18,15 +18,26 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; import java.util.Optional; +import java.util.Spliterator; +import java.util.Spliterators; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; -import org.junit.After; +import org.junit.AfterClass; import org.junit.Before; -import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.logging.slf4j.logback.TestAppender; +import org.springframework.data.gemfire.util.ArrayUtils; +import org.springframework.data.gemfire.util.CollectionUtils; +import org.springframework.geode.logging.slf4j.logback.support.LogbackSupport; +import org.springframework.util.StringUtils; -import org.slf4j.ILoggerFactory; +import org.assertj.core.api.InstanceOfAssertFactories; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,118 +45,286 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.util.ContextInitializer; import ch.qos.logback.core.Appender; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusListener; /** - * Abstract base class for testing the spring-geode-starter-logging and spring-gemfire-starter modules. + * Abstract base class for testing the spring-geode-starter-logging and spring-geode-starter modules. * * @author John Blum * @see org.slf4j.Logger * @see org.slf4j.LoggerFactory - * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.data.gemfire.tests.logging.slf4j.logback.TestAppender - * @see ch.qos.logback.classic.Level + * @see ch.qos.logback.classic.Logger * @see ch.qos.logback.classic.LoggerContext * @see ch.qos.logback.classic.util.ContextInitializer - * @see ch.qos.logback.core.Appender * @since 1.3.0 */ -public abstract class AbstractLoggingIntegrationTests extends IntegrationTestsSupport { +@SuppressWarnings("unused") +public abstract class AbstractLoggingIntegrationTests { + + private static final boolean STATUS_DEBUG_ENABLED = false; + + private static final Class LOGBACK_LOGGER_TYPE = + ch.qos.logback.classic.Logger.class; + + private static final Function LOGBACK_LOGGER_LEVEL = + ch.qos.logback.classic.Logger::getLevel; protected static final String APACHE_GEODE_LOGGER_NAME = "org.apache.geode"; + protected static final String CONSOLE_APPENDER_NAME = "CONSOLE"; + protected static final String DELEGATE_APPENDER_NAME = "delegate"; protected static final String SPRING_BOOT_DATA_GEMFIRE_LOG_LEVEL_PROPERTY = "spring.boot.data.gemfire.log.level"; - private Logger apacheGeodeLogger = LoggerFactory.getLogger(APACHE_GEODE_LOGGER_NAME); + private static TestAppender testAppender; - private TestAppender testAppender; + private static ch.qos.logback.classic.Logger assertLogbackLogger(org.slf4j.Logger slf4jLogger, + String loggerName, Level logLevel) { - protected TestAppender getTestAppender() { + assertThat(slf4jLogger).isInstanceOf(LOGBACK_LOGGER_TYPE); + assertThat(slf4jLogger.getName()).isEqualTo(loggerName); + assertThat(slf4jLogger) + .asInstanceOf(InstanceOfAssertFactories.type(LOGBACK_LOGGER_TYPE)) + .extracting(LOGBACK_LOGGER_LEVEL) + .isEqualTo(logLevel); + + return LOGBACK_LOGGER_TYPE.cast(slf4jLogger); + } + + private static LoggerContext assertLogbackLoggerConfiguration(LoggerContext loggerContext, + String... loggerNames) { + + List configuredLoggerNames = CollectionUtils.nullSafeList(loggerContext.getLoggerList()).stream() + .filter(Objects::nonNull) + .map(Logger::getName) + .filter(StringUtils::hasText) + .collect(Collectors.toList()); + + assertThat(configuredLoggerNames).contains(loggerNames); + + return loggerContext; + } - assertThat(this.testAppender).describedAs("TestAppender could not be resolved").isNotNull(); + private static ch.qos.logback.classic.Logger assertLogbackLoggerAppenderConfiguration( + ch.qos.logback.classic.Logger logbackLogger, String... appenderNames) { - return this.testAppender; + Spliterator> configuredTestLoggerAppenders = + Spliterators.spliteratorUnknownSize(logbackLogger.iteratorForAppenders(), Spliterator.NONNULL); + + List configuredTestLoggerAppenderNames = + StreamSupport.stream(configuredTestLoggerAppenders, false) + .filter(Objects::nonNull) + .map(Appender::getName) + .filter(StringUtils::hasText) + .collect(Collectors.toList()); + + assertThat(configuredTestLoggerAppenderNames).contains(appenderNames); + + return logbackLogger; } - protected Level getTestLogLevel() { - return Level.INFO; + private static void log(String message, Object... args) { + System.err.printf(message, args); + System.err.flush(); } - public void assertApacheGeodeLoggerLogLevel(Level logLevel) { + private static ch.qos.logback.classic.Logger logConfiguredAppenders(ch.qos.logback.classic.Logger logger) { - Optional.ofNullable(this.apacheGeodeLogger) - .filter(ch.qos.logback.classic.Logger.class::isInstance) - .map(ch.qos.logback.classic.Logger.class::cast) - .map(logger -> { - assertThat(logger.getLevel()).isEqualTo(logLevel); - return logger; - }) - .orElseThrow(() -> newIllegalStateException("'org.apache.geode' Logger not found")); + log("Configured Appenders: "); + + Spliterator> appenders = + Spliterators.spliteratorUnknownSize(logger.iteratorForAppenders(), Spliterator.NONNULL); + + log("%s%n", Arrays.toString(StreamSupport.stream(appenders, false) + .filter(Objects::nonNull) + .map(Appender::getName) + .filter(StringUtils::hasText) + .toArray(String[]::new))); + + return logger; } - @Before - public void setup() { + private static LoggerContext logConfiguredLoggers(LoggerContext loggerContext) { + + log("Configured Loggers: "); + + log("%s%n", Arrays.toString(loggerContext.getLoggerList().stream() + .filter(Objects::nonNull) + .map(Logger::getName) + .filter(StringUtils::hasText) + .toArray(String[]::new))); + + return loggerContext; + } + + protected static void setupLogback(Level testLogLevel) { - configureLogging(); + configureLogging(testLogLevel); configureRootLoggerDelegatingAppender(); - logMessages(); } - private void configureLogging() { + @SuppressWarnings("all") + private static void configureLogging(Level testLogLevel) { - System.setProperty(SPRING_BOOT_DATA_GEMFIRE_LOG_LEVEL_PROPERTY, getTestLogLevel().toString()); + try { - ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory(); + System.setProperty(SPRING_BOOT_DATA_GEMFIRE_LOG_LEVEL_PROPERTY, testLogLevel.toString()); - assertThat(loggerFactory).isInstanceOf(LoggerContext.class); + LogbackSupport.resetLogback(); - LoggerContext loggerContext = (LoggerContext) loggerFactory; + LoggerContext loggerContext = LogbackSupport.requireLoggerContext(); - try { - new ContextInitializer(loggerContext).autoConfig(); + initializeLogback(loggerContext) + .getStatusManager().add(LoggingStatusListener.create().debug(STATUS_DEBUG_ENABLED)); + + logConfiguredLoggers(loggerContext); + assertLogbackLoggerConfiguration(loggerContext, + Logger.ROOT_LOGGER_NAME, APACHE_GEODE_LOGGER_NAME, "com.gemstone.gemfire", "org.jgroups"); + + ch.qos.logback.classic.Logger logbackOrgApacheGeodeLogger = assertLogbackLogger(loggerContext + .getLogger(APACHE_GEODE_LOGGER_NAME), APACHE_GEODE_LOGGER_NAME, testLogLevel); + + logConfiguredAppenders(logbackOrgApacheGeodeLogger); + assertLogbackLoggerAppenderConfiguration(logbackOrgApacheGeodeLogger, + CONSOLE_APPENDER_NAME, DELEGATE_APPENDER_NAME); } catch (Exception cause) { - throw newIllegalStateException("Failed to configure and initialize SLF4J/Logback logging context", cause); + throw newIllegalStateException("Failed to configure and initialize SLF4J/Logback", cause); } } - @SuppressWarnings({ "rawtypes", "unchecked" }) - private void configureRootLoggerDelegatingAppender() { + private static LoggerContext initializeLogback(LoggerContext loggerContext) throws JoranException { + + new ContextInitializer(loggerContext).autoConfig(); + + return loggerContext; + } - Logger rootLogger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static void configureRootLoggerDelegatingAppender() { - assertThat(rootLogger).isInstanceOf(ch.qos.logback.classic.Logger.class); + ch.qos.logback.classic.Logger logbackRootLogger = + assertLogbackLogger(LogbackSupport.requireLogbackRootLogger(), Logger.ROOT_LOGGER_NAME, Level.ERROR); - ch.qos.logback.classic.Logger logbackRootLogger = (ch.qos.logback.classic.Logger) rootLogger; + assertThat(logbackRootLogger.getAppender(CONSOLE_APPENDER_NAME)).isNull(); - Appender delegateAppender = logbackRootLogger.getAppender("delegate"); + Appender delegateAppender = logbackRootLogger.getAppender(DELEGATE_APPENDER_NAME); assertThat(delegateAppender).isNotNull(); - assertThat(delegateAppender.getName()).isEqualTo("delegate"); + assertThat(delegateAppender.getName()).isEqualTo(DELEGATE_APPENDER_NAME); + + TestAppender testAppender = initializeTestAppender(); + + ((DelegatingAppender) delegateAppender).setAppender(testAppender); + + assertThat(delegateAppender) + .asInstanceOf(InstanceOfAssertFactories.type(DelegatingAppender.class)) + .extracting(DelegatingAppender::getAppender) + .isSameAs(testAppender); + } - this.testAppender = new TestAppender(); - this.testAppender.start(); + private static TestAppender initializeTestAppender() { - ((DelegatingAppender) delegateAppender).setAppender(this.testAppender); + testAppender = new TestAppender(); + testAppender.start(); - assertThat(((DelegatingAppender) delegateAppender).getAppender()).isSameAs(this.testAppender); + return testAppender; } - public void logMessages() { + @AfterClass + public static void cleanupTestContext() { + + System.clearProperty(SPRING_BOOT_DATA_GEMFIRE_LOG_LEVEL_PROPERTY); + Optional.ofNullable(testAppender).ifPresent(TestAppender::clear); + } + + private Logger apacheGeodeLogger; + + @Before + public void initializeApacheGeodeLoggerReference() { + this.apacheGeodeLogger = LoggerFactory.getLogger(APACHE_GEODE_LOGGER_NAME); + } + + protected TestAppender getTestAppender() { + + assertThat(testAppender) + .describedAs("TestAppender could not be resolved") + .isNotNull(); + + return testAppender; + } + + protected void assertApacheGeodeLoggerLogLevel(Level logLevel) { + + Optional.ofNullable(this.apacheGeodeLogger) + .filter(LOGBACK_LOGGER_TYPE::isInstance) + .map(LOGBACK_LOGGER_TYPE::cast) + .map(logger -> { + + assertThat(logger.getName()).isEqualTo(APACHE_GEODE_LOGGER_NAME); + assertThat(logger.getLevel()).isEqualTo(logLevel); + + return logger; + }) + .orElseThrow(() -> newIllegalStateException("'%s' Logger not found", APACHE_GEODE_LOGGER_NAME)); + } + + protected void assertLogMessages(String... logMessages) { + + logMessages(); + + Arrays.stream(ArrayUtils.nullSafeArray(logMessages, String.class)).forEach(logMessage -> + assertThat(getTestAppender().lastLogMessage()).isEqualTo(logMessage)); + + assertThat(getTestAppender().lastLogMessage()).isNull(); + } + + protected void logMessages() { assertThat(this.apacheGeodeLogger).isNotNull(); + this.apacheGeodeLogger.trace("TRACE TEST"); this.apacheGeodeLogger.debug("DEBUG TEST"); this.apacheGeodeLogger.info("INFO TEST"); + this.apacheGeodeLogger.warn("WARN TEST"); this.apacheGeodeLogger.error("ERROR TEST"); } - @After - public void tearDown() { + protected static class LoggingStatusListener implements StatusListener { - Optional.ofNullable(this.testAppender).ifPresent(it -> { - it.clear(); - it.stop(); - }); + protected static LoggingStatusListener create() { + return new LoggingStatusListener(); + } - System.clearProperty(SPRING_BOOT_DATA_GEMFIRE_LOG_LEVEL_PROPERTY); + private volatile boolean debug = false; + + protected boolean isDebugging() { + return this.debug; + } + + @Override + public void addStatusEvent(Status status) { + + if (isDebugging()) { + logStatus(status); + } + } + + protected LoggingStatusListener debug(boolean debug) { + this.debug = debug; + return this; + } + + private void logStatus(Status status) { + + log("[STATUS] %s: %s%n", status.getOrigin(), status.getMessage()); + + if (status.hasChildren()) { + for (Status child : CollectionUtils.iterable(status.iterator())) { + logStatus(child); + } + } + } } } diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DebugLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DebugLoggingIntegrationTests.java index 1713c22cc..6c6269b8e 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DebugLoggingIntegrationTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DebugLoggingIntegrationTests.java @@ -15,12 +15,9 @@ */ package org.springframework.geode.logging.slf4j.logback; -import static org.assertj.core.api.Assertions.assertThat; - +import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.data.gemfire.tests.logging.slf4j.logback.TestAppender; - import ch.qos.logback.classic.Level; /** @@ -40,24 +37,20 @@ */ public class DebugLoggingIntegrationTests extends AbstractLoggingIntegrationTests { - @Override - protected Level getTestLogLevel() { - return Level.DEBUG; + private static final Level TEST_LOG_LEVEL = Level.DEBUG; + + @BeforeClass + public static void setupLogback() { + setupLogback(TEST_LOG_LEVEL); } @Test public void logLevelIsSetToDebug() { - assertApacheGeodeLoggerLogLevel(Level.DEBUG); + assertApacheGeodeLoggerLogLevel(TEST_LOG_LEVEL); } @Test public void logMessagesAtDebug() { - - TestAppender testAppender = getTestAppender(); - - assertThat(testAppender.lastLogMessage()).isEqualTo("ERROR TEST"); - assertThat(testAppender.lastLogMessage()).isEqualTo("INFO TEST"); - assertThat(testAppender.lastLogMessage()).isEqualTo("DEBUG TEST"); - assertThat(testAppender.lastLogMessage()).isNull(); + assertLogMessages("ERROR TEST", "WARN TEST", "INFO TEST", "DEBUG TEST"); } } diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/ErrorLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/ErrorLoggingIntegrationTests.java new file mode 100644 index 000000000..5690dd794 --- /dev/null +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/ErrorLoggingIntegrationTests.java @@ -0,0 +1,52 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.springframework.geode.logging.slf4j.logback; + +import org.junit.BeforeClass; +import org.junit.Test; + +import ch.qos.logback.classic.Level; + +/** + * Integration Tests testing the {@literal org.apache.geode} {@link org.slf4j.Logger} + * with the log level {@link Level#ERROR}. + * + * @author John Blum + * @see org.junit.Test + * @see org.springframework.data.gemfire.tests.logging.slf4j.logback.TestAppender + * @see org.springframework.geode.logging.slf4j.logback.ErrorLoggingIntegrationTests + * @see ch.qos.logback.classic.Level#ERROR + * @since 1.7.5 + */ +public class ErrorLoggingIntegrationTests extends AbstractLoggingIntegrationTests { + + private static final Level TEST_LOG_LEVEL = Level.ERROR; + + @BeforeClass + public static void setupLogback() { + setupLogback(TEST_LOG_LEVEL); + } + + @Test + public void logLevelIsSetToDebug() { + assertApacheGeodeLoggerLogLevel(TEST_LOG_LEVEL); + } + + @Test + public void logMessagesAtDebug() { + assertLogMessages("ERROR TEST"); + } +} diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/InfoLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/InfoLoggingIntegrationTests.java index 72633039d..36a1c7ff6 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/InfoLoggingIntegrationTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/InfoLoggingIntegrationTests.java @@ -15,12 +15,9 @@ */ package org.springframework.geode.logging.slf4j.logback; -import static org.assertj.core.api.Assertions.assertThat; - +import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.data.gemfire.tests.logging.slf4j.logback.TestAppender; - import ch.qos.logback.classic.Level; /** @@ -36,18 +33,20 @@ */ public class InfoLoggingIntegrationTests extends AbstractLoggingIntegrationTests { + private static final Level TEST_LOG_LEVEL = Level.INFO; + + @BeforeClass + public static void setupLogback() { + setupLogback(TEST_LOG_LEVEL); + } + @Test public void logLevelIsSetToInfo() { - assertApacheGeodeLoggerLogLevel(Level.INFO); + assertApacheGeodeLoggerLogLevel(TEST_LOG_LEVEL); } @Test public void logsMessagesAtInfo() { - - TestAppender testAppender = getTestAppender(); - - assertThat(testAppender.lastLogMessage()).isEqualTo("ERROR TEST"); - assertThat(testAppender.lastLogMessage()).isEqualTo("INFO TEST"); - assertThat(testAppender.lastLogMessage()).isNull(); + assertLogMessages("ERROR TEST", "WARN TEST", "INFO TEST"); } } diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/NoLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/NoLoggingIntegrationTests.java index 9e3e7e666..89f9f8b7f 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/NoLoggingIntegrationTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/NoLoggingIntegrationTests.java @@ -15,12 +15,9 @@ */ package org.springframework.geode.logging.slf4j.logback; -import static org.assertj.core.api.Assertions.assertThat; - +import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.data.gemfire.tests.logging.slf4j.logback.TestAppender; - import ch.qos.logback.classic.Level; /** @@ -40,21 +37,20 @@ */ public class NoLoggingIntegrationTests extends AbstractLoggingIntegrationTests { - @Override - protected Level getTestLogLevel() { - return Level.OFF; + private static final Level TEST_LOG_LEVEL = Level.OFF; + + @BeforeClass + public static void setupLogback() { + setupLogback(TEST_LOG_LEVEL); } @Test public void logLevelIsSetToOff() { - assertApacheGeodeLoggerLogLevel(Level.OFF); + assertApacheGeodeLoggerLogLevel(TEST_LOG_LEVEL); } @Test public void logsNoMessages() { - - TestAppender testAppender = getTestAppender(); - - assertThat(testAppender.lastLogMessage()).isNull(); + assertLogMessages(); } } From 8dd55e8634ea0e14b4b9f4928a297bf244d7115a Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 09:15:28 -0700 Subject: [PATCH 147/201] Upgrade Spring Geode Samples to Spring Boot 2.7.5-SNAPSHOT and SBDG 1.7.5-SNAPSHOT. --- spring-geode-samples/intro/getting-started/pom.xml | 2 +- spring-geode-samples/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-geode-samples/intro/getting-started/pom.xml b/spring-geode-samples/intro/getting-started/pom.xml index 967711fc5..b2ddef34c 100644 --- a/spring-geode-samples/intro/getting-started/pom.xml +++ b/spring-geode-samples/intro/getting-started/pom.xml @@ -8,7 +8,7 @@ org.springframework.geode spring-geode-samples-parent - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT ../../pom.xml diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index 2e9446a55..b0b0bc209 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,13 +8,13 @@ org.springframework.boot spring-boot-starter-parent - 2.7.4 + 2.7.5-SNAPSHOT org.springframework.geode spring-geode-samples-parent - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT pom Spring Geode Samples Parent @@ -42,19 +42,19 @@ org.springframework.geode spring-geode-starter - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT org.springframework.geode spring-geode-starter-logging - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT org.springframework.geode spring-geode-starter-test - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT From bafff66133717d7c099dfe3b615a20d9b1f59c23 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 09:14:39 -0700 Subject: [PATCH 148/201] Upgrade to Gradle 6.9.3. --- 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 ec991f9aa..d355f4c4f 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.9.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 18b27eea2681c56fd55e91ad9c3d41a906c2cb86 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 09:24:51 -0700 Subject: [PATCH 149/201] Upgrade to Spring Boot 2.7.5. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 148e3efec..e0dab206e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.16 springVersion=5.3.23 -springBootVersion=2.7.5-SNAPSHOT +springBootVersion=2.7.5 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.3 springDataGeodeVersion=2.7.3 From 614ccba10edd3e01c81ba5937a8ef405614ac2d7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 09:25:59 -0700 Subject: [PATCH 150/201] Upgrade to Spring Data BOM 2021.2.5 (Raj-SR5). --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e0dab206e..de38807eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.16 springVersion=5.3.23 springBootVersion=2.7.5 springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.3 +springDataBomVersion=2021.2.5 springDataGeodeVersion=2.7.3 springDataGeodeTestVersion=0.3.1-RAJ springSessionBomVersion=2021.2.0 From fec38caa7987a33d09d0fa610d03fb6cc0ec892a Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 09:26:28 -0700 Subject: [PATCH 151/201] Upgrade to Spring Data for Apache Geode 2.7.5. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index de38807eb..dbf412c59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.23 springBootVersion=2.7.5 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.5 -springDataGeodeVersion=2.7.3 +springDataGeodeVersion=2.7.5 springDataGeodeTestVersion=0.3.1-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 From 2cf952951246814419945a15426e43e661f23040 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 09:31:02 -0700 Subject: [PATCH 152/201] Upgrade to Spring Test for Apache Geode (STDG) 0.3.4-RAJ. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index dbf412c59..4dd707431 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ springBootVersion=2.7.5 springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.5 springDataGeodeVersion=2.7.5 -springDataGeodeTestVersion=0.3.1-RAJ +springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE From 593946346655ec4eeb8d61092349a473eff6ff5b Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 09:31:32 -0700 Subject: [PATCH 153/201] Upgrade to Testcontainers 1.17.5. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4dd707431..6687f75f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE -testcontainersVersion=1.17.3 +testcontainersVersion=1.17.5 version=1.7.5-SNAPSHOT From 7e9dca80bbb4e87619d98fba2c8145f1a3ab3dc4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 10:15:44 -0700 Subject: [PATCH 154/201] Fixup spring-geode-starter-logging tests based on Spring Boot 2.7 logging (SLF4J, Logback) configuration. --- .../AbstractLoggingIntegrationTests.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java index 4559057dc..887b1332a 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java @@ -59,6 +59,7 @@ * @see ch.qos.logback.classic.Logger * @see ch.qos.logback.classic.LoggerContext * @see ch.qos.logback.classic.util.ContextInitializer + * @see ch.qos.logback.core.Appender * @since 1.3.0 */ @SuppressWarnings("unused") @@ -73,8 +74,10 @@ public abstract class AbstractLoggingIntegrationTests { ch.qos.logback.classic.Logger::getLevel; protected static final String APACHE_GEODE_LOGGER_NAME = "org.apache.geode"; - protected static final String CONSOLE_APPENDER_NAME = "CONSOLE"; + protected static final String CONSOLE_APPENDER_NAME = "console"; protected static final String DELEGATE_APPENDER_NAME = "delegate"; + protected static final String GEMSTONE_GEMFIRE_LOGGER_NAME = "com.gemstone.gemfire"; + protected static final String JGROUPS_LOGGER_NAME = "org.jgroups"; protected static final String SPRING_BOOT_DATA_GEMFIRE_LOG_LEVEL_PROPERTY = "spring.boot.data.gemfire.log.level"; private static TestAppender testAppender; @@ -179,15 +182,17 @@ private static void configureLogging(Level testLogLevel) { .getStatusManager().add(LoggingStatusListener.create().debug(STATUS_DEBUG_ENABLED)); logConfiguredLoggers(loggerContext); - assertLogbackLoggerConfiguration(loggerContext, - Logger.ROOT_LOGGER_NAME, APACHE_GEODE_LOGGER_NAME, "com.gemstone.gemfire", "org.jgroups"); + assertLogbackLoggerConfiguration(loggerContext,Logger.ROOT_LOGGER_NAME, + APACHE_GEODE_LOGGER_NAME, GEMSTONE_GEMFIRE_LOGGER_NAME, JGROUPS_LOGGER_NAME); + + ch.qos.logback.classic.Logger logbackRootLogger = assertLogbackLogger(loggerContext + .getLogger(Logger.ROOT_LOGGER_NAME), Logger.ROOT_LOGGER_NAME, Level.ERROR); ch.qos.logback.classic.Logger logbackOrgApacheGeodeLogger = assertLogbackLogger(loggerContext .getLogger(APACHE_GEODE_LOGGER_NAME), APACHE_GEODE_LOGGER_NAME, testLogLevel); - logConfiguredAppenders(logbackOrgApacheGeodeLogger); - assertLogbackLoggerAppenderConfiguration(logbackOrgApacheGeodeLogger, - CONSOLE_APPENDER_NAME, DELEGATE_APPENDER_NAME); + logConfiguredAppenders(logbackRootLogger); + assertLogbackLoggerAppenderConfiguration(logbackRootLogger, DELEGATE_APPENDER_NAME); } catch (Exception cause) { throw newIllegalStateException("Failed to configure and initialize SLF4J/Logback", cause); From 7250a349ed64ce5b0b911c6920c3a505a3fed5a6 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 10:16:30 -0700 Subject: [PATCH 155/201] Upgrade Spring Geode Samples to Spring Boot 2.7.5. --- spring-geode-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index b0b0bc209..d1321cc00 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.5-SNAPSHOT + 2.7.5 From 857f15665262be6e025c5647cf712e9bbabc0e13 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 10:48:47 -0700 Subject: [PATCH 156/201] Adapt to API changes in Jackson (JSON) 2.13.4. Cleanup deprecations in JacksonObjectToJsonConverter class that was using a deprecated API in ObjectMapper, replacing the deprecated API invocation with the equivalent API in JsonMapper. --- .../support/JacksonObjectToJsonConverter.java | 24 ++--- ...JacksonObjectToJsonConverterUnitTests.java | 97 ++++++++----------- 2 files changed, 56 insertions(+), 65 deletions(-) diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverter.java index e70c3ca23..51acd9e4f 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverter.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; import org.springframework.core.convert.ConversionFailedException; import org.springframework.core.convert.TypeDescriptor; @@ -90,6 +91,16 @@ public class JacksonObjectToJsonConverter implements ObjectToJsonConverter { return newObjectMapper(source).writeValueAsString(source); } + /** + * Constructs a new instance of Jackson's {@link JsonMapper.Builder}. + * + * @return a new instance of Jackson's {@link JsonMapper.Builder}; never {@literal null}. + * @see com.fasterxml.jackson.databind.json.JsonMapper.Builder + */ + @NonNull JsonMapper.Builder newJsonMapperBuilder() { + return JsonMapper.builder(); + } + /** * Constructs a new instance of the Jackson {@link ObjectMapper} class. * @@ -100,24 +111,15 @@ public class JacksonObjectToJsonConverter implements ObjectToJsonConverter { Assert.notNull(target, "Target object must not be null"); - return newObjectMapper() + return newJsonMapperBuilder() .addMixIn(target.getClass(), ObjectTypeMetadataMixin.class) .configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true) .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true) .configure(SerializationFeature.INDENT_OUTPUT, true) + .build() .findAndRegisterModules(); } - /** - * Constructs a new instance of Jackson's {@link ObjectMapper}. - * - * @return a new instance of Jackson's {@link ObjectMapper}; never {@literal null}. - * @see com.fasterxml.jackson.databind.ObjectMapper - */ - @NonNull ObjectMapper newObjectMapper() { - return new ObjectMapper(); - } - @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverterUnitTests.java index 8416c7b0b..db7ad121d 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/converter/support/JacksonObjectToJsonConverterUnitTests.java @@ -16,6 +16,8 @@ package org.springframework.geode.data.json.converter.support; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -34,6 +36,7 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; import org.junit.Test; @@ -73,27 +76,21 @@ public void convertObjectToJson() throws JsonProcessingException { verify(mockObjectMapper, times(1)).writeValueAsString(eq(source)); } - @Test(expected = IllegalArgumentException.class) + @Test + @SuppressWarnings("all") public void convertNullThrowsIllegalArgumentException() { JacksonObjectToJsonConverter converter = spy(new JacksonObjectToJsonConverter()); - try { - converter.convert(null); - } - catch (IllegalArgumentException expected) { - - assertThat(expected).hasMessage("Source object to convert must not be null"); - assertThat(expected).hasNoCause(); + assertThatIllegalArgumentException() + .isThrownBy(() -> converter.convert(null)) + .withMessage("Source object to convert must not be null") + .withNoCause(); - throw expected; - } - finally { - verify(converter, never()).newObjectMapper(any()); - } + verify(converter, never()).newObjectMapper(any()); } - @Test(expected = ConversionFailedException.class) + @Test public void convertHandlesJsonProcessingException() throws JsonProcessingException { Object source = new Object(); @@ -106,36 +103,24 @@ public void convertHandlesJsonProcessingException() throws JsonProcessingExcepti doThrow(new JsonGenerationException("TEST", (JsonGenerator) null)) .when(mockObjectMapper).writeValueAsString(any()); - try { - converter.convert(source); - } - catch (ConversionFailedException expected) { - - assertThat(expected.getCause()).isInstanceOf(JsonProcessingException.class); - assertThat(expected.getCause()).hasMessage("TEST"); - assertThat(expected.getCause()).hasNoCause(); - - throw expected; - } - finally { - verify(converter, times(1)).newObjectMapper(eq(source)); - verify(mockObjectMapper, times(1)).writeValueAsString(eq(source)); - } + assertThatExceptionOfType(ConversionFailedException.class) + .isThrownBy(() -> converter.convert(source)) + .withMessageStartingWith("Failed to convert from type [java.lang.Object] to type [java.lang.String] for value") + .withMessageContaining("TEST") + .withCauseInstanceOf(JsonGenerationException.class); + + verify(converter, times(1)).newObjectMapper(eq(source)); + verify(mockObjectMapper, times(1)).writeValueAsString(eq(source)); } - @Test(expected = IllegalArgumentException.class) + @Test + @SuppressWarnings("all") public void newObjectMapperWithNullTarget() { - try { - new JacksonObjectToJsonConverter().newObjectMapper(null); - } - catch (IllegalArgumentException expected) { - - assertThat(expected).hasMessage("Target object must not be null"); - assertThat(expected).hasNoCause(); - - throw expected; - } + assertThatIllegalArgumentException() + .isThrownBy(() -> new JacksonObjectToJsonConverter().newObjectMapper(null)) + .withMessage("Target object must not be null") + .withNoCause(); } @Test @@ -143,32 +128,36 @@ public void newObjectMapperIsConfiguredCorrectly() { Object target = Customer.newCustomer(1L, "Jon Doe"); - ObjectMapper mockObjectMapper = mock(ObjectMapper.class); + JsonMapper mockJsonMapper = mock(JsonMapper.class); + + JsonMapper.Builder mockJsonMapperBuilder = mock(JsonMapper.Builder.class); JacksonObjectToJsonConverter converter = spy(new JacksonObjectToJsonConverter()); - doReturn(mockObjectMapper).when(converter).newObjectMapper(); - doReturn(mockObjectMapper).when(mockObjectMapper).addMixIn(any(), any()); - doReturn(mockObjectMapper).when(mockObjectMapper).configure(any(JsonGenerator.Feature.class), anyBoolean()); - doReturn(mockObjectMapper).when(mockObjectMapper).configure(any(MapperFeature.class), anyBoolean()); - doReturn(mockObjectMapper).when(mockObjectMapper).configure(any(SerializationFeature.class), anyBoolean()); - doReturn(mockObjectMapper).when(mockObjectMapper).findAndRegisterModules(); + doReturn(mockJsonMapperBuilder).when(converter).newJsonMapperBuilder(); + doReturn(mockJsonMapperBuilder).when(mockJsonMapperBuilder).addMixIn(any(), any()); + doReturn(mockJsonMapperBuilder).when(mockJsonMapperBuilder).configure(any(JsonGenerator.Feature.class), anyBoolean()); + doReturn(mockJsonMapperBuilder).when(mockJsonMapperBuilder).configure(any(MapperFeature.class), anyBoolean()); + doReturn(mockJsonMapperBuilder).when(mockJsonMapperBuilder).configure(any(SerializationFeature.class), anyBoolean()); + doReturn(mockJsonMapper).when(mockJsonMapperBuilder).build(); + doReturn(mockJsonMapper).when(mockJsonMapper).findAndRegisterModules(); ObjectMapper objectMapper = converter.newObjectMapper(target); assertThat(objectMapper).isNotNull(); - verify(converter, times(1)).newObjectMapper(); + verify(converter, times(1)).newJsonMapperBuilder(); - verify(mockObjectMapper, times(1)) + verify(mockJsonMapperBuilder, times(1)) .addMixIn(eq(target.getClass()), eq(JacksonObjectToJsonConverter.ObjectTypeMetadataMixin.class)); - verify(mockObjectMapper, times(1)) + verify(mockJsonMapperBuilder, times(1)) .configure(eq(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN), eq(true)); - verify(mockObjectMapper, times(1)) + verify(mockJsonMapperBuilder, times(1)) .configure(eq(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY), eq(true)); - verify(mockObjectMapper, times(1)) + verify(mockJsonMapperBuilder, times(1)) .configure(eq(SerializationFeature.INDENT_OUTPUT), eq(true)); - verify(mockObjectMapper, times(1)).findAndRegisterModules(); - verifyNoMoreInteractions(mockObjectMapper); + verify(mockJsonMapperBuilder, times(1)).build(); + verify(mockJsonMapper, times(1)).findAndRegisterModules(); + verifyNoMoreInteractions(mockJsonMapperBuilder, mockJsonMapper); } } From 469b43ec4c58ba7dfd51102f97e7bf85306e3edd Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 12:13:16 -0700 Subject: [PATCH 157/201] Edit changelog and include 1.6.13 release notes. --- spring-geode/src/main/resources/changelog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 3a5565b97..6631815ad 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,18 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.13 (2022-10-24) +-------------------------------------- +Aligns SBDG with Spring Boot 2.6.13. + +* Built with Oracle Java 8, JDK 1.8.0_341. +* Upgrades to Gradle 6.9.3. +* Upgrades to Spring Boot 2.6.13. +* Upgrades to Spring Data BOM 2021.1.9 (Q-SR9). +* Upgrades to Spring Data for Apache Geode 2.6.9. +* Upgrades to Testcontainers 1.17.5. + + Changes in version 1.7.4 (2022-09-23) ------------------------------------- Aligns SBDG with Spring Boot 2.7.4 From a7fbf3542d100ac47a5a331d543283a557556ea2 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 12:13:46 -0700 Subject: [PATCH 158/201] Edit README to refer to SBDG 1.6.13 release and 1.6.14-SNAPSHOT. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 44227835e..720de4650 100644 --- a/README.adoc +++ b/README.adoc @@ -75,8 +75,8 @@ The following SBDG versions are currently maintained and developed. | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] | `1.7.5-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.7.4`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] -| `1.6.13-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.6.12`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] +| `1.6.14-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.6.13`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] |=== From 06f1c9623fd2a285cdee212e4160cf5eeabfc2d8 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 12:17:53 -0700 Subject: [PATCH 159/201] Edit changelog and add 1.7.5 release notes. --- spring-geode/src/main/resources/changelog.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 6631815ad..7d2a16a4f 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,21 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.7.5 (2022-10-24) +------------------------------------- +Aligns SBDG with Spring Boot 2.7.5. + +* Built with Oracle Java 8, JDK 1.8.0_341. +* Improves functionality and support of logging in the spring-geode-starter-logging and better integrates with +Spring Boot logging. +* Upgrades to Gradle 6.9.3. +* Upgrades to Spring Boot 2.7.5. +* Upgrades to Spring Data BOM 2021.2.5 (RAJ-SR5). +* Upgrades to Spring Data for Apache Geode 2.7.5. +* Upgrades to Spring Test for Apache Geode 0.3.4-RAJ. +* Upgrades to Testcontainers 1.17.5. + + Changes in version 1.6.13 (2022-10-24) -------------------------------------- Aligns SBDG with Spring Boot 2.6.13. From 717fa9faec98bcd728effc330d7d8c300c2355ba Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 12:20:47 -0700 Subject: [PATCH 160/201] Release 1.7.5. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6687f75f5..4b6c8b4d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.5 -version=1.7.5-SNAPSHOT +version=1.7.5 From abf1ddbbd7b6e9490244281e3f443c26acad3a5e Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 12:34:24 -0700 Subject: [PATCH 161/201] Prepare next development iteration. Set Spring Boot version to 2.7.6-SNAPSHOT. Set version to 1.7.6-SNAPSHOT. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4b6c8b4d3..de5eccf64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.16 springVersion=5.3.23 -springBootVersion=2.7.5 +springBootVersion=2.7.6-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.5 springDataGeodeVersion=2.7.5 @@ -17,4 +17,4 @@ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.5 -version=1.7.5 +version=1.7.6-SNAPSHOT From 9e2d47d59db12f55e20384daaa4a4a499cb4c0c8 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 12:44:39 -0700 Subject: [PATCH 162/201] Upgrade Spring Geode Samples to Spring Boot 2.7.6-SNAPSHOT and SBDG 1.7.6-SNAPSHOT. --- spring-geode-samples/intro/getting-started/pom.xml | 2 +- spring-geode-samples/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-geode-samples/intro/getting-started/pom.xml b/spring-geode-samples/intro/getting-started/pom.xml index b2ddef34c..12bc8c6a3 100644 --- a/spring-geode-samples/intro/getting-started/pom.xml +++ b/spring-geode-samples/intro/getting-started/pom.xml @@ -8,7 +8,7 @@ org.springframework.geode spring-geode-samples-parent - 1.7.5-SNAPSHOT + 1.7.6-SNAPSHOT ../../pom.xml diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index d1321cc00..f0af78ef3 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,13 +8,13 @@ org.springframework.boot spring-boot-starter-parent - 2.7.5 + 2.7.6-SNAPSHOT org.springframework.geode spring-geode-samples-parent - 1.7.5-SNAPSHOT + 1.7.6-SNAPSHOT pom Spring Geode Samples Parent @@ -42,19 +42,19 @@ org.springframework.geode spring-geode-starter - 1.7.5-SNAPSHOT + 1.7.6-SNAPSHOT org.springframework.geode spring-geode-starter-logging - 1.7.5-SNAPSHOT + 1.7.6-SNAPSHOT org.springframework.geode spring-geode-starter-test - 1.7.5-SNAPSHOT + 1.7.6-SNAPSHOT From 288745051385907f67ba7cc74c408677a34cb3ca Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 24 Oct 2022 12:46:41 -0700 Subject: [PATCH 163/201] Edit README to refer to Spring Boot 2.7.5 and SBDG 1.7.5. --- README.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 720de4650..6c045430d 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ :spring-docs: https://docs.spring.io/spring-framework/docs/current/reference/html/ :sbdg-docs: https://docs.spring.io/spring-boot-data-geode-build/current/reference/html5/ :sbdg-javadoc: https://docs.spring.io/spring-boot-data-geode-build/current/api/ -:sbdg-version: 1.7.4 -:spring-boot-version: 2.7.4 +:sbdg-version: 1.7.5 +:spring-boot-version: 2.7.5 :geode-javadoc: https://geode.apache.org/releases/latest/javadoc :geode-name: Apache Geode :gemfire-name: VMware Tanzu GemFire @@ -73,8 +73,8 @@ The following SBDG versions are currently maintained and developed. | Version | Reference Documentation | Javadoc | Samples | `current` | {sbdg-docs}[Ref Docs] | {sbdg-javadoc}[Javadoc] | {sbdg-docs}#geode-samples[Samples] -| `1.7.5-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] -| `1.7.4`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] +| `1.7.6-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x-SNAPSHOT/reference/html5/#geode-samples[Samples] +| `1.7.5`| https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/#geode-samples[Samples] | `1.6.14-SNAPSHOT`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x-SNAPSHOT/reference/html5/#geode-samples[Samples] | `1.6.13`| https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/[Ref Docs] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/api/[Javadoc] | https://docs.spring.io/spring-boot-data-geode-build/1.6.x/reference/html5/#geode-samples[Samples] From 1731be110fcab118a263e86c6eeb8aaca107b30c Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 5 Dec 2022 14:21:48 -0800 Subject: [PATCH 164/201] Edit changelog and include 1.6.14 release notes. --- spring-geode/src/main/resources/changelog.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spring-geode/src/main/resources/changelog.txt b/spring-geode/src/main/resources/changelog.txt index 7d2a16a4f..d9fa38c04 100644 --- a/spring-geode/src/main/resources/changelog.txt +++ b/spring-geode/src/main/resources/changelog.txt @@ -4,6 +4,21 @@ https://github.com/spring-projects/spring-boot-data-geode ========================================================= +Changes in version 1.6.14 (2022-12-05) +-------------------------------------- +Aligns SBDG with Spring Boot 2.6.14. + +* Built with Oracle Java 8, JDK 1.8.0_351. +* Upgrades to VMware GemFire 9.10.17. +* Upgrades to Spring Framework 5.3.24. +* Upgrades to Spring Boot 2.6.14. +* Upgrades to Spring Data BOM 2021.1.10 (Q-SR10). +* Upgrades to Spring Data for Apache Geode 2.6.10. +* Upgrades to Spring Session for Apache Geode 2.6.3. +* Upgrades to Spring Test for Apache Geode 0.2.4-Q. +* Upgrades to Testcontainers 1.17.6. + + Changes in version 1.7.5 (2022-10-24) ------------------------------------- Aligns SBDG with Spring Boot 2.7.5. From a2bb802e6932712a629bc7a6e44a3edb6576387b Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 5 Dec 2022 14:22:37 -0800 Subject: [PATCH 165/201] Upgrade to VMware GemFire 9.10.17. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index de5eccf64..042aa8f33 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ awaitilityVersion=4.2.0 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 -pivotalGemFireVersion=9.10.16 +pivotalGemFireVersion=9.10.17 springVersion=5.3.23 springBootVersion=2.7.6-SNAPSHOT springCloudBindingsVersion=1.8.1 From ae5b23782bca45ca92faf967db110298f745c6da Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 5 Dec 2022 14:22:55 -0800 Subject: [PATCH 166/201] Upgrade to Spring Framework 5.3.24. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 042aa8f33..4e11e5463 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.17 -springVersion=5.3.23 +springVersion=5.3.24 springBootVersion=2.7.6-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.5 From b9e657e85ccfca8b5560a7e70e1714b8ebe5710b Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 5 Dec 2022 14:23:42 -0800 Subject: [PATCH 167/201] Set Spring Boot version to 2.7.7-SNAPSHOT. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4e11e5463..fa95156a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.17 springVersion=5.3.24 -springBootVersion=2.7.6-SNAPSHOT +springBootVersion=2.7.7-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.5 springDataGeodeVersion=2.7.5 From ebe2e501287b8bdfc28345938d5ef9cd94181a69 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 5 Dec 2022 14:24:23 -0800 Subject: [PATCH 168/201] Upgrade to Spring Data BOM 2021.2.6. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fa95156a4..ec77b387f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.17 springVersion=5.3.24 springBootVersion=2.7.7-SNAPSHOT springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.5 +springDataBomVersion=2021.2.6 springDataGeodeVersion=2.7.5 springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.0 From 2bf863ba8bcebe1278b7439c086436b35ca336dd Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 5 Dec 2022 14:24:39 -0800 Subject: [PATCH 169/201] Upgrade to Spring Data for Apache Geode 2.7.6. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ec77b387f..137ffaad4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.24 springBootVersion=2.7.7-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.6 -springDataGeodeVersion=2.7.5 +springDataGeodeVersion=2.7.6 springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 From c1e68c53f7eaa0b019b168c050ff9ca5d23cd9d1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 5 Dec 2022 14:25:19 -0800 Subject: [PATCH 170/201] Upgrade to Testcontainers 1.17.6. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 137ffaad4..4384eb8f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.0 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE -testcontainersVersion=1.17.5 +testcontainersVersion=1.17.6 version=1.7.6-SNAPSHOT From 740092b009c9548448c7ff1b1ae1cab4fc0475a5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 5 Dec 2022 15:08:36 -0800 Subject: [PATCH 171/201] Upgrade Spring Geode Samples Maven POM to Spring Boot 2.7.7-SNAPSHOT. --- spring-geode-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index f0af78ef3..17109251f 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.6-SNAPSHOT + 2.7.7-SNAPSHOT From de5368e324b6b00a6dda9501fec565e53d10d284 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 17 Jan 2023 12:47:10 -0800 Subject: [PATCH 172/201] Include NOTICE in README. The NOTICE summarizes and outlines the future roadmap of the SBDG project. --- README.adoc | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/README.adoc b/README.adoc index 6c045430d..dbc76b8ea 100644 --- a/README.adoc +++ b/README.adoc @@ -21,6 +21,36 @@ https://spring.io/projects/spring-data-geode[_Spring Data for {geode-name}_] (SD https://spring.io/projects/spring-session-data-geode[_Spring Session for {geode-name}_] (SSDG) and https://github.com/spring-projects/spring-test-data-geode[_Spring Test for {geode-name}_] (STDG). +[[notice]] +== NOTICE + +[[notice-2023-january]] +*2023-January-17*: + +At the end of 2022, VMware https://tanzu.vmware.com/content/blog/spring-for-vmware-gemfire-is-now-available[announced] +the general availability of the Spring for VMware GemFire portfolio of projects. + +While these Spring based projects for VMware GemFire are open source and a succession to the Spring for Apache Geode +projects, they are not a replacement. VMware GemFire forked from the Apache Geode project and is not open source. +Additionally, newer Apache Geode and VMware GemFire clients are not backwards compatible with older Apache Geode +and VMware GemFire servers. You can begin the transition by starting https://docs.vmware.com/en/Spring-Boot-for-VMware-GemFire/index.html[here]. + +Alternatively, the Spring portfolio provides first-class https://docs.spring.io/spring-boot/docs/current/reference/html/io.html#io.caching.provider[integration] +with other comparable caching providers. Also, see https://docs.spring.io/spring-framework/docs/current/reference/html/integration.html#cache-store-configuration[here] +and https://docs.spring.io/spring-framework/docs/current/reference/html/integration.html#cache-plug[here]. + +Finally, keep in mind, the Spring for Apache Geode projects will still be maintained until OSS and commercial support +ends. Maintenance will only include CVE and critical fixes. No new features or major enhancements will be made. +The Spring Boot for Apache Geode support timelines can be viewed https://spring.io/projects/spring-boot#support[here]. +Also see the https://github.com/spring-projects/spring-boot-data-geode/wiki/Spring-Boot-for-Apache-Geode-and-VMware-Tanzu-GemFire-Version-Compatibility-Matrix[Version Compatibility Matrix] +for up-to-date dependency and version details. + +[[notice-2022-october]] +*2022-October-24*: + +See the October 24th https://github.com/spring-projects/spring-data-geode#notice[NOTICE] +on the _Spring Data for Apache Geode_ GitHub project page for complete details. + [[project-features]] === Project Features From dfb4731088e4d7ef5d55b6d72bf2803d75c22e6f Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 11 May 2023 14:19:44 -0700 Subject: [PATCH 173/201] Upgrade to Spring Framework 5.3.27. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4384eb8f4..f1b2a6e47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.17 -springVersion=5.3.24 +springVersion=5.3.27 springBootVersion=2.7.7-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.6 From 1a2b8ee477e6024e220bff1e710f2d61aa898a99 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 11 May 2023 14:57:15 -0700 Subject: [PATCH 174/201] Set Spring Boot version to 2.7.12-SNAPSHOT. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f1b2a6e47..860a725e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.17 springVersion=5.3.27 -springBootVersion=2.7.7-SNAPSHOT +springBootVersion=2.7.12-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.6 springDataGeodeVersion=2.7.6 From fd8d56b8868cbf290a596edb743612db624c61f1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 11 May 2023 15:11:47 -0700 Subject: [PATCH 175/201] Upgrade to Spring Data BOM 2021.2.11. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 860a725e9..c39a596cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.17 springVersion=5.3.27 springBootVersion=2.7.12-SNAPSHOT springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.6 +springDataBomVersion=2021.2.11 springDataGeodeVersion=2.7.6 springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.0 From 977a0788ea36a191aff7ef23589b6aafa98c5083 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 11 May 2023 15:15:48 -0700 Subject: [PATCH 176/201] Upgrade to Spring Session BOM 2021.2.1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c39a596cd..ab3408da8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.11 springDataGeodeVersion=2.7.6 springDataGeodeTestVersion=0.3.4-RAJ -springSessionBomVersion=2021.2.0 +springSessionBomVersion=2021.2.1 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.17.6 From fa9f91a5d7417287f5b9cc6677d1cfde3b27c999 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 11 May 2023 15:17:04 -0700 Subject: [PATCH 177/201] Upgrade to Testcontainers 1.18.1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ab3408da8..319952b6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.1 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE -testcontainersVersion=1.17.6 +testcontainersVersion=1.18.1 version=1.7.6-SNAPSHOT From cfc20164845d2ef699491e0198b0c6d5947b7b4e Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 11 May 2023 15:18:56 -0700 Subject: [PATCH 178/201] Upgrade to Gradle 6.9.4. --- 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 d355f4c4f..53b9e3802 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.9.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 30a6823668ff1401c7761164ef2ad0cdef56cfb5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 11 May 2023 15:30:58 -0700 Subject: [PATCH 179/201] Upgrade Spring Geode Samples to Spring Boot 2.7.12-SNAPSHOT. --- spring-geode-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-geode-samples/pom.xml b/spring-geode-samples/pom.xml index 17109251f..e8a0a10f7 100644 --- a/spring-geode-samples/pom.xml +++ b/spring-geode-samples/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.7-SNAPSHOT + 2.7.12-SNAPSHOT From 13b53b68e202f2587292b25efb421447010ff0f1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 11 May 2023 15:31:37 -0700 Subject: [PATCH 180/201] Upgrade to Temurin JDK 8u362 for use in the Jenkins CI env. --- ci/pipeline.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 1ae0d73ec..fbd84ba1d 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,5 +1,5 @@ # Java (JDK) versions -java.main.tag=8u322-b06-jdk +java.main.tag=8u362-b09-jdk-focal # Docker Container Images docker.container.image.java.main=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag} From 5a766dfbaf387cd39a680ec846b9097087a45d3d Mon Sep 17 00:00:00 2001 From: John Blum Date: Sat, 13 May 2023 14:13:26 -0700 Subject: [PATCH 181/201] Run SBDG Gradle build in Jenkins CI inside the context of an authenticated DockerHub Registery block. This should avoid the DockerHub rate limit problem currently affecting the build. --- Jenkinsfile | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2a0b92629..27eaf12ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,30 +26,32 @@ pipeline { } steps { script { - docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { + docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) { - sh "echo 'Setup build environment...'" - sh "ci/setup.sh" + sh "echo 'Setup build environment...'" + sh "ci/setup.sh" - // Cleanup any prior build system resources - try { - sh "echo 'Clean up GemFire/Geode files & build artifacts...'" - sh "ci/cleanupGemFiles.sh" - sh "ci/cleanupArtifacts.sh" - } - catch (ignore) { } + // Cleanup any prior build system resources + try { + sh "echo 'Clean up GemFire/Geode files & build artifacts...'" + sh "ci/cleanupGemFiles.sh" + sh "ci/cleanupArtifacts.sh" + } + catch (ignore) { } - // Run the SBDG project Gradle build using JDK 8 inside Docker - try { - sh "echo 'Building SBDG...'" - sh "ci/check.sh" - } - catch (e) { - currentBuild.result = "FAILED: build" - throw e - } - finally { - junit '**/build/test-results/*/*.xml' + // Run the SBDG project Gradle build using JDK 8 inside Docker + try { + sh "echo 'Building SBDG...'" + sh "ci/check.sh" + } + catch (e) { + currentBuild.result = "FAILED: build" + throw e + } + finally { + junit '**/build/test-results/*/*.xml' + } } } } From 6629bfc4e0301c1a5904536b2fa3d9fcdd77cb85 Mon Sep 17 00:00:00 2001 From: John Blum Date: Sat, 13 May 2023 14:19:46 -0700 Subject: [PATCH 182/201] Switch Jenkins CI pipeline build to using Gradle clean build in ci/build.sh. --- Jenkinsfile | 4 ++-- ci/build.sh | 6 ++++++ ci/check.sh | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100755 ci/build.sh diff --git a/Jenkinsfile b/Jenkinsfile index 27eaf12ee..0defc8393 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,15 +35,15 @@ pipeline { // Cleanup any prior build system resources try { sh "echo 'Clean up GemFire/Geode files & build artifacts...'" - sh "ci/cleanupGemFiles.sh" sh "ci/cleanupArtifacts.sh" + sh "ci/cleanupGemFiles.sh" } catch (ignore) { } // Run the SBDG project Gradle build using JDK 8 inside Docker try { sh "echo 'Building SBDG...'" - sh "ci/check.sh" + sh "ci/build.sh" } catch (e) { currentBuild.result = "FAILED: build" diff --git a/ci/build.sh b/ci/build.sh new file mode 100755 index 000000000..142295523 --- /dev/null +++ b/ci/build.sh @@ -0,0 +1,6 @@ +#!/bin/bash -x + +set -eou pipefail + +GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/build-gradle-cache" \ + ./gradlew --no-daemon --refresh-dependencies --stacktrace clean build diff --git a/ci/check.sh b/ci/check.sh index 3911036e7..24e3b2694 100755 --- a/ci/check.sh +++ b/ci/check.sh @@ -3,4 +3,4 @@ set -eou pipefail GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/build-gradle-cache" \ - ./gradlew clean check --no-daemon --refresh-dependencies --stacktrace + ./gradlew --no-daemon --refresh-dependencies --stacktrace clean check From 3a6cc56cbdf0d81dd81cbe8232e0a215037b1b61 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 2 Jun 2023 11:04:21 -0700 Subject: [PATCH 183/201] Authenticate with Artifactory to build the SBDG artifact(s) and deploy docs. Authentication with Artifactory is necessary to resolve the io.spring.docresources:spring-doc-resources:0.2.5 artifact from repo.spring.io/release. --- Jenkinsfile | 65 ++++++++++++++++++++++++++++++----------------------- ci/build.sh | 5 ++++- ci/check.sh | 4 +++- 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0defc8393..e825a8af2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,6 +21,9 @@ pipeline { stages { stage('Build') { + environment { + ARTIFACTORY = credentials("${p['artifactory.credentials']}") + } options { timeout(time: 15, unit: "MINUTES") } @@ -28,29 +31,30 @@ pipeline { script { docker.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) { + withCredentials([usernamePassword(credentialsId: p['artifactory.credentials'], usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { + sh "echo 'Setup build environment...'" + sh "ci/setup.sh" + + // Cleanup any prior build system resources + try { + sh "echo 'Clean up GemFire/Geode files & build artifacts...'" + sh "ci/cleanupArtifacts.sh" + sh "ci/cleanupGemFiles.sh" + } + catch (ignore) { } - sh "echo 'Setup build environment...'" - sh "ci/setup.sh" - - // Cleanup any prior build system resources - try { - sh "echo 'Clean up GemFire/Geode files & build artifacts...'" - sh "ci/cleanupArtifacts.sh" - sh "ci/cleanupGemFiles.sh" - } - catch (ignore) { } - - // Run the SBDG project Gradle build using JDK 8 inside Docker - try { - sh "echo 'Building SBDG...'" - sh "ci/build.sh" - } - catch (e) { - currentBuild.result = "FAILED: build" - throw e - } - finally { - junit '**/build/test-results/*/*.xml' + // Run the SBDG project Gradle build using JDK 8 inside Docker + try { + sh "echo 'Building SBDG...'" + sh "ci/build.sh" + } + catch (e) { + currentBuild.result = "FAILED: build" + throw e + } + finally { + junit '**/build/test-results/*/*.xml' + } } } } @@ -59,6 +63,9 @@ pipeline { } stage ('Deploy Docs') { + environment { + ARTIFACTORY = credentials("${p['artifactory.credentials']}") + } options { timeout(time: 15, unit: "MINUTES") } @@ -66,12 +73,14 @@ pipeline { script { docker.image('adoptopenjdk/openjdk8:latest').inside("--name ${env.HOSTNAME}Two -u root -v /tmp:/tmp") { withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - try { - sh "ci/deployDocs.sh" - } - catch (e) { - currentBuild.result = "FAILED: deploy docs" - throw e + withCredentials([usernamePassword(credentialsId: p['artifactory.credentials'], usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { + try { + sh "ci/deployDocs.sh" + } + catch (e) { + currentBuild.result = "FAILED: deploy docs" + throw e + } } } } diff --git a/ci/build.sh b/ci/build.sh index 142295523..f4f3969b0 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -3,4 +3,7 @@ set -eou pipefail GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/build-gradle-cache" \ - ./gradlew --no-daemon --refresh-dependencies --stacktrace clean build + ./gradlew --no-daemon --refresh-dependencies --stacktrace clean build \ + -PartifactoryUsername=$ARTIFACTORY_USERNAME \ + -PartifactoryPassword=$ARTIFACTORY_PASSWORD + diff --git a/ci/check.sh b/ci/check.sh index 24e3b2694..b12de2a2e 100755 --- a/ci/check.sh +++ b/ci/check.sh @@ -3,4 +3,6 @@ set -eou pipefail GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/build-gradle-cache" \ - ./gradlew --no-daemon --refresh-dependencies --stacktrace clean check + ./gradlew --no-daemon --refresh-dependencies --stacktrace clean check \ + -PartifactoryUsername=$ARTIFACTORY_USERNAME \ + -PartifactoryPassword=$ARTIFACTORY_PASSWORD From 9b9957ec380c1def13d5d344fdb9bce9ba3bc21e Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 2 Jun 2023 14:51:23 -0700 Subject: [PATCH 184/201] Import Spring Build Conventions Gradle Plugins 0.0.38. --- buildSrc/build.gradle | 45 ++++ .../AbstractSpringJavaPlugin.groovy | 88 +++++++ .../convention/ArtifactoryPlugin.groovy | 58 +++++ .../gradle/convention/CheckstylePlugin.groovy | 49 ++++ .../DependencyManagementExportTask.groovy | 61 +++++ .../convention/DependencySetPlugin.groovy | 126 ++++++++++ .../gradle/convention/DeployDocsPlugin.groovy | 82 +++++++ .../gradle/convention/DocsPlugin.groovy | 73 ++++++ .../convention/IntegrationTestPlugin.groovy | 121 ++++++++++ .../gradle/convention/JacocoPlugin.groovy | 41 ++++ .../gradle/convention/JavadocApiPlugin.groovy | 105 +++++++++ .../convention/JavadocOptionsPlugin.groovy | 15 ++ .../ManagementConfigurationPlugin.java | 33 +++ .../gradle/convention/MavenBomPlugin.groovy | 54 +++++ .../gradle/convention/MavenBomTask.groovy | 87 +++++++ .../gradle/convention/MergePlugin.groovy | 182 +++++++++++++++ .../gradle/convention/OssrhPlugin.groovy | 41 ++++ .../RepositoryConventionPlugin.groovy | 80 +++++++ .../convention/RootProjectPlugin.groovy | 78 +++++++ .../convention/SchemaDeployPlugin.groovy | 71 ++++++ .../gradle/convention/SchemaPlugin.groovy | 15 ++ .../gradle/convention/SchemaZipPlugin.groovy | 43 ++++ .../gradle/convention/SortedProperties.groovy | 52 +++++ ...ependencyManagementConventionPlugin.groovy | 54 +++++ .../convention/SpringMavenPlugin.groovy | 221 ++++++++++++++++++ .../convention/SpringModulePlugin.groovy | 50 ++++ .../gradle/convention/SpringPomPlugin.groovy | 24 ++ .../convention/SpringSampleBootPlugin.groovy | 43 ++++ .../convention/SpringSamplePlugin.groovy | 33 +++ .../convention/SpringSampleWarPlugin.groovy | 97 ++++++++ .../gradle/convention/SpringTestPlugin.groovy | 30 +++ .../TestsConfigurationPlugin.groovy | 54 +++++ .../io/spring/gradle/convention/Utils.groovy | 34 +++ .../AsciidoctorConventionPlugin.java | 208 +++++++++++++++++ ...o.spring.convention.artifactory.properties | 1 + .../io.spring.convention.bom.properties | 1 + ...io.spring.convention.checkstyle.properties | 1 + ...pring.convention.dependency-set.properties | 1 + .../io.spring.convention.docs.properties | 1 + ...ing.convention.integration-test.properties | 1 + .../io.spring.convention.jacoco.properties | 1 + ...o.spring.convention.javadoc-api.properties | 1 + ...ring.convention.javadoc-options.properties | 1 + .../io.spring.convention.maven.properties | 1 + .../io.spring.convention.merge.properties | 1 + .../io.spring.convention.ossrh.properties | 1 + ...io.spring.convention.repository.properties | 1 + .../io.spring.convention.root.properties | 1 + ...spring.convention.spring-module.properties | 1 + ...io.spring.convention.spring-pom.properties | 1 + ...g.convention.spring-sample-boot.properties | 1 + ...ng.convention.spring-sample-war.properties | 1 + ...spring.convention.spring-sample.properties | 1 + ...o.spring.convention.spring-test.properties | 1 + ...ntion.springdependencymangement.properties | 1 + ....convention.tests-configuration.properties | 1 + 56 files changed, 2470 insertions(+) create mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/DependencyManagementExportTask.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocOptionsPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/ManagementConfigurationPlugin.java create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomTask.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/MergePlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/OssrhPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SpringMavenPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SpringPomPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/Utils.groovy create mode 100644 buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.artifactory.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.bom.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.checkstyle.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.dependency-set.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.docs.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.integration-test.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.jacoco.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.javadoc-api.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.javadoc-options.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.maven.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.merge.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.ossrh.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.repository.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.root.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-module.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-pom.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample-boot.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample-war.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-test.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.springdependencymangement.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.tests-configuration.properties diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 000000000..0579d28b3 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,45 @@ +plugins { + id "java-gradle-plugin" + id "com.jfrog.artifactory" version '4.9.10' + id 'com.github.ben-manes.versions' version '0.25.0' +} + +apply plugin: 'java' +apply plugin: 'groovy' +apply plugin: 'maven' + +group 'io.spring.gradle' + +sourceCompatibility = 1.8 + +repositories { + jcenter() + gradlePluginPortal() + mavenCentral() + maven { url 'https://repo.spring.io/plugins-release/' } +} + +configurations { + implementation { + exclude module: 'groovy-all' + } +} + +dependencies { + + implementation localGroovy() + + implementation 'com.github.ben-manes:gradle-versions-plugin:0.25.0' + implementation 'gradle.plugin.org.gretty:gretty:3.0.1' + implementation 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1' + implementation 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE' + implementation 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE' + implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15' + implementation 'io.spring.nohttp:nohttp-gradle:0.0.3.RELEASE' + implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.1.0' + implementation 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.1.0' + implementation 'org.hidetake:gradle-ssh-plugin:2.10.1' + implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.10' + implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1' + +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy new file mode 100644 index 000000000..3c991dbad --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy @@ -0,0 +1,88 @@ +/* + * Copyright 2002-2016 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention; + +import io.spring.gradle.propdeps.PropDepsMavenPlugin; +import org.gradle.api.Plugin; +import org.gradle.api.Project; +import org.gradle.api.plugins.GroovyPlugin; +import org.gradle.api.plugins.JavaPlugin; +import org.gradle.api.plugins.MavenPlugin; +import org.gradle.api.plugins.PluginManager; +import org.gradle.internal.impldep.org.apache.maven.Maven; +import org.gradle.plugins.ide.eclipse.EclipseWtpPlugin; +import org.gradle.plugins.ide.idea.IdeaPlugin; +import io.spring.gradle.propdeps.PropDepsEclipsePlugin; +import io.spring.gradle.propdeps.PropDepsIdeaPlugin; +import io.spring.gradle.propdeps.PropDepsPlugin; + +/** + * @author Rob Winch + */ +public abstract class AbstractSpringJavaPlugin implements Plugin { + + @Override + public final void apply(Project project) { + PluginManager pluginManager = project.getPluginManager(); + pluginManager.apply(JavaPlugin.class); + pluginManager.apply(ManagementConfigurationPlugin.class); + if (project.file("src/main/groovy").exists() + || project.file("src/test/groovy").exists() + || project.file("src/integration-test/groovy").exists()) { + pluginManager.apply(GroovyPlugin.class); + } + pluginManager.apply("io.spring.convention.repository"); + pluginManager.apply(EclipseWtpPlugin); + pluginManager.apply(IdeaPlugin); + pluginManager.apply(PropDepsPlugin); + pluginManager.apply(PropDepsEclipsePlugin); + pluginManager.apply(PropDepsIdeaPlugin); + project.getPlugins().withType(MavenPlugin) { + pluginManager.apply(PropDepsMavenPlugin); + } + pluginManager.apply("io.spring.convention.tests-configuration"); + pluginManager.apply("io.spring.convention.integration-test"); + pluginManager.apply("io.spring.convention.springdependencymangement"); + pluginManager.apply("io.spring.convention.dependency-set"); + pluginManager.apply("io.spring.convention.javadoc-options"); + pluginManager.apply("io.spring.convention.checkstyle"); + pluginManager.apply('com.github.ben-manes.versions'); + + copyPropertyFromRootProjectTo("group", project); + copyPropertyFromRootProjectTo("version", project); + copyPropertyFromRootProjectTo("description", project); + + project.jar { + manifest.attributes["Created-By"] = + "${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})" + manifest.attributes["Implementation-Title"] = project.name + manifest.attributes["Implementation-Version"] = project.version + manifest.attributes["Automatic-Module-Name"] = project.name.replace('-', '.') + } + additionalPlugins(project); + } + + private void copyPropertyFromRootProjectTo(String propertyName, Project project) { + Project rootProject = project.getRootProject(); + Object property = rootProject.findProperty(propertyName); + if(property != null) { + project.setProperty(propertyName, property); + } + } + + protected abstract void additionalPlugins(Project project); +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy new file mode 100644 index 000000000..d21e08bc5 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy @@ -0,0 +1,58 @@ +/* + * Copyright 2002-2017 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package io.spring.gradle.convention + +import org.gradle.api.Plugin +import org.gradle.api.Project + +class ArtifactoryPlugin implements Plugin { + + @Override + void apply(Project project) { + project.plugins.apply('com.jfrog.artifactory') + String name = Utils.getProjectName(project); + boolean isSnapshot = Utils.isSnapshot(project); + boolean isMilestone = Utils.isMilestone(project); + project.artifactory { + contextUrl = 'https://repo.spring.io' + publish { + repository { + repoKey = isSnapshot ? 'libs-snapshot-local' : isMilestone ? 'libs-milestone-local' : 'libs-release-local' + if(project.hasProperty('artifactoryUsername')) { + username = artifactoryUsername + password = artifactoryPassword + } + } + } + } + + project.artifactoryPublish { + publishIvy false + properties = [ + 'bintray.package': "${project.group}:${name}", + 'bintray.version': "${project.version}" + ] + } + + project.artifactory { + publish { + defaults { + publishConfigs('archives') + } + } + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy new file mode 100644 index 000000000..1bfbbecbd --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy @@ -0,0 +1,49 @@ +/* + * Copyright 2016-2019 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.JavaPlugin + +/** + * Adds and configures Checkstyle plugin. + * + * @author Vedran Pavic + */ +class CheckstylePlugin implements Plugin { + + final CHECKSTYLE_DIR = 'etc/checkstyle' + + @Override + void apply(Project project) { + project.plugins.withType(JavaPlugin) { + def checkstyleDir = project.rootProject.file(CHECKSTYLE_DIR) + if (checkstyleDir.exists() && checkstyleDir.directory) { + project.getPluginManager().apply('checkstyle') + project.dependencies.add('checkstyle', 'io.spring.javaformat:spring-javaformat-checkstyle:0.0.15') + project.dependencies.add('checkstyle', 'io.spring.nohttp:nohttp-checkstyle:0.0.3.RELEASE') + + project.checkstyle { + configDir = checkstyleDir + toolVersion = '8.21' + } + } + } + } + +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencyManagementExportTask.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencyManagementExportTask.groovy new file mode 100644 index 000000000..f70afc1b6 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencyManagementExportTask.groovy @@ -0,0 +1,61 @@ +package io.spring.gradle.convention + +import org.gradle.api.Project +import org.gradle.api.artifacts.component.ModuleComponentSelector +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.Internal; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Map; +import java.util.Properties; + +import org.gradle.api.DefaultTask; +import org.gradle.api.artifacts.Configuration; +import org.gradle.api.tasks.TaskAction; + +import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension; + +public class DependencyManagementExportTask extends DefaultTask { + @Internal + def projects; + + @Input + String getProjectNames() { + return projects*.name + } + + @TaskAction + public void dependencyManagementExport() throws IOException { + def projects = this.projects ?: project.subprojects + project + def configurations = projects*.configurations*.findAll { ['testRuntime','integrationTestRuntime','grettyRunnerTomcat8','ajtools'].contains(it.name) } + def dependencyResults = configurations*.incoming*.resolutionResult*.allDependencies.flatten() + def moduleVersionVersions = dependencyResults.findAll { r -> r.requested instanceof ModuleComponentSelector }.collect { r-> r.selected.moduleVersion } + + def projectDependencies = projects.collect { p-> "${p.group}:${p.name}:${p.version}".toString() } as Set + def dependencies = moduleVersionVersions.collect { d -> + "${d.group}:${d.name}:${d.version}".toString() + }.sort() as Set + + println '' + println '' + println 'dependencyManagement {' + println '\tdependencies {' + dependencies.findAll { d-> !projectDependencies.contains(d)}.each { + println "\t\tdependency '$it'" + } + println '\t}' + println '}' + println '' + println '' + println 'TIP Use this to find duplicates:\n$ sort gradle/dependency-management.gradle| uniq -c | grep -v \'^\\s*1\'' + println '' + println '' + } + + void setOutputFile(File file) throws IOException { + this.output = new FileOutputStream(file); + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy new file mode 100644 index 000000000..02b0037e2 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy @@ -0,0 +1,126 @@ +/* + * Copyright 2002-2017 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package io.spring.gradle.convention; + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.JavaPlugin + +/** + * Adds sets of dependencies to make it easy to add a grouping of dependencies. The + * dependencies added are: + * + *
    + *
  • sockDependencies
    • + *
  • seleniumDependencies
    • + *
  • gebDependencies
    • + *
  • powerMockDependencies
    • + *
  • slf4jDependencies
    • + *
  • jstlDependencies
    • + *
  • apachedsDependencies
    • + *
+ * + * @author Rob Winch + */ +public class DependencySetPlugin implements Plugin { + @Override + public void apply(Project project) { + + project.ext.spockDependencies = [ + project.dependencies.create("org.spockframework:spock-spring") { + exclude group: 'junit', module: 'junit-dep' + }, + project.dependencies.create("org.spockframework:spock-core") { + exclude group: 'junit', module: 'junit-dep' + } + ] + + project.ext.seleniumDependencies = [ + "org.seleniumhq.selenium:htmlunit-driver", + "org.seleniumhq.selenium:selenium-support" + ] + + project.ext.gebDependencies = project.spockDependencies + + project.seleniumDependencies + [ + "org.gebish:geb-spock", + 'commons-httpclient:commons-httpclient', + "org.codehaus.groovy:groovy", + "org.codehaus.groovy:groovy-all" + ] + + project.ext.powerMockDependencies = [ + "org.powermock:powermock-core", + "org.powermock:powermock-api-support", + "org.powermock:powermock-module-junit4-common", + "org.powermock:powermock-module-junit4", + project.dependencies.create("org.powermock:powermock-api-mockito") { + exclude group: 'org.mockito', module: 'mockito-all' + }, + "org.powermock:powermock-reflect" + ] + + project.ext.powerMock2Dependencies = [ + "org.powermock:powermock-core", + "org.powermock:powermock-api-support", + "org.powermock:powermock-module-junit4-common", + "org.powermock:powermock-module-junit4", + project.dependencies.create("org.powermock:powermock-api-mockito2") { + exclude group: 'org.mockito', module: 'mockito-all' + }, + "org.powermock:powermock-reflect" + ] + + project.ext.slf4jDependencies = [ + "org.slf4j:slf4j-api", + "org.slf4j:jcl-over-slf4j", + "org.slf4j:log4j-over-slf4j", + "ch.qos.logback:logback-classic" + ] + + project.ext.springCoreDependency = [ + project.dependencies.create("org.springframework:spring-core") { + exclude(group: 'commons-logging', module: 'commons-logging') + } + ] + + project.ext.testDependencies = [ + "junit:junit", + "org.mockito:mockito-core", + "org.springframework:spring-test", + "org.assertj:assertj-core" + ] + + project.ext.jstlDependencies = [ + "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api", + "org.apache.taglibs:taglibs-standard-jstlel" + ] + + project.ext.apachedsDependencies = [ + "org.apache.directory.server:apacheds-core", + "org.apache.directory.server:apacheds-core-entry", + "org.apache.directory.server:apacheds-protocol-shared", + "org.apache.directory.server:apacheds-protocol-ldap", + "org.apache.directory.server:apacheds-server-jndi", + 'org.apache.directory.shared:shared-ldap' + ] + + project.plugins.withType(JavaPlugin) { + project.dependencies { + testCompile project.testDependencies + } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy new file mode 100644 index 000000000..fa0551fd2 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy @@ -0,0 +1,82 @@ +/* + * Copyright 2002-2017 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package io.spring.gradle.convention + +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.tasks.bundling.Zip +import org.gradle.api.Plugin +import org.gradle.api.Project + +public class DeployDocsPlugin implements Plugin { + + @Override + public void apply(Project project) { + project.getPluginManager().apply('org.hidetake.ssh') + + project.ssh.settings { + knownHosts = allowAnyHosts + } + project.remotes { + docs { + role 'docs' + if (project.hasProperty('deployDocsHost')) { + host = project.findProperty('deployDocsHost') + } else { + host = 'docs-ip.spring.io' + } + retryCount = 5 // retry 5 times (default is 0) + retryWaitSec = 10 // wait 10 seconds between retries (default is 0) + user = project.findProperty('deployDocsSshUsername') + if (project.hasProperty('deployDocsSshKeyPath')) { + identity = project.file(project.findProperty('deployDocsSshKeyPath')) + } else if (project.hasProperty('deployDocsSshKey')) { + identity = project.findProperty('deployDocsSshKey') + } + if(project.hasProperty('deployDocsSshPassphrase')) { + passphrase = project.findProperty('deployDocsSshPassphrase') + } + } + } + + project.task('deployDocs') { + dependsOn 'docsZip' + doFirst { + project.ssh.run { + session(project.remotes.docs) { + def now = System.currentTimeMillis() + def name = project.rootProject.name + def version = project.rootProject.version + def tempPath = "/tmp/${name}-${now}-docs/".replaceAll(' ', '_') + execute "mkdir -p $tempPath" + + project.tasks.docsZip.outputs.each { o -> + put from: o.files, into: tempPath + } + + execute "unzip $tempPath*.zip -d $tempPath" + + def extractPath = "/var/www/domains/spring.io/docs/htdocs/autorepo/docs/${name}/${version}/" + + execute "rm -rf $extractPath" + execute "mkdir -p $extractPath" + execute "mv $tempPath/docs/* $extractPath" + execute "chmod -R g+w $extractPath" + } + } + } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy new file mode 100644 index 000000000..0eb1ad42a --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy @@ -0,0 +1,73 @@ +package io.spring.gradle.convention + +import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask +import org.gradle.api.Action +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.Task +import org.gradle.api.artifacts.Configuration +import org.gradle.api.artifacts.DependencySet +import org.gradle.api.plugins.PluginManager +import org.gradle.api.tasks.Sync +import org.gradle.api.tasks.bundling.Zip + +/** + * Aggregates asciidoc, javadoc, and deploying of the docs into a single plugin + */ +public class DocsPlugin implements Plugin { + + @Override + public void apply(Project project) { + + PluginManager pluginManager = project.getPluginManager(); + pluginManager.apply("org.asciidoctor.jvm.convert"); + pluginManager.apply("org.asciidoctor.jvm.pdf"); + pluginManager.apply(AsciidoctorConventionPlugin); + pluginManager.apply(DeployDocsPlugin); + pluginManager.apply(JavadocApiPlugin); + + String projectName = Utils.getProjectName(project); + String pdfFilename = projectName + "-reference.pdf"; + + project.tasks.withType(AbstractAsciidoctorTask) { t -> + project.configure(t) { + sources { + include "**/*.adoc" + exclude '_*/**' + } + } + } + + + Task docsZip = project.tasks.create('docsZip', Zip) { + dependsOn 'api', 'asciidoctor' + group = 'Distribution' + baseName = project.rootProject.name + classifier = 'docs' + description = "Builds -${classifier} archive containing all " + + "Docs for deployment at docs.spring.io" + + from(project.tasks.asciidoctor.outputs) { + into 'reference/html5' + include '**' + } + from(project.tasks.asciidoctorPdf.outputs) { + into 'reference/pdf' + include '**' + rename "index.pdf", pdfFilename + } + from(project.tasks.api.outputs) { + into 'api' + } + into 'docs' + duplicatesStrategy 'exclude' + } + + Task docs = project.tasks.create("docs") { + group = 'Documentation' + description 'An aggregator task to generate all the documentation' + dependsOn docsZip + } + project.tasks.assemble.dependsOn docs + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy new file mode 100644 index 000000000..5fda90d74 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy @@ -0,0 +1,121 @@ +/* + * Copyright 2016-2018 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package io.spring.gradle.convention + +import io.spring.gradle.propdeps.PropDepsPlugin +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.Task +import org.gradle.api.plugins.GroovyPlugin +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.tasks.testing.Test +import org.gradle.plugins.ide.eclipse.EclipsePlugin +import org.gradle.plugins.ide.idea.IdeaPlugin + +/** + * + * Adds support for integration tests to java projects. + * + *
    + *
  • Adds integrationTestCompile and integrationTestRuntime configurations
    • + *
  • A new source test folder of src/integration-test/java has been added
    • + *
  • A task to run integration tests named integrationTest is added
    • + *
  • If Groovy plugin is added a new source test folder src/integration-test/groovy is added
    • + *
+ * + * @author Rob Winch + */ +public class IntegrationTestPlugin implements Plugin { + + @Override + public void apply(Project project) { + project.plugins.withType(JavaPlugin.class) { + applyJava(project) + } + } + + private applyJava(Project project) { + if(!project.file('src/integration-test/').exists()) { + // ensure we don't add if no tests to avoid adding Gretty + return + } + project.configurations { + integrationTestCompile { + extendsFrom testCompile + } + integrationTestRuntime { + extendsFrom integrationTestCompile, testRuntime + } + } + + project.sourceSets { + integrationTest { + java.srcDir project.file('src/integration-test/java') + resources.srcDir project.file('src/integration-test/resources') + compileClasspath = project.sourceSets.main.output + project.sourceSets.test.output + project.configurations.integrationTestCompile + runtimeClasspath = output + compileClasspath + project.configurations.integrationTestRuntime + } + } + + Task integrationTestTask = project.tasks.create("integrationTest", Test) { + group = 'Verification' + description = 'Runs the integration tests.' + dependsOn 'jar' + testClassesDirs = project.sourceSets.integrationTest.output.classesDirs + classpath = project.sourceSets.integrationTest.runtimeClasspath + shouldRunAfter project.tasks.test + } + project.tasks.check.dependsOn integrationTestTask + + project.plugins.withType(IdeaPlugin) { + project.idea { + module { + testSourceDirs += project.file('src/integration-test/java') + scopes.TEST.plus += [ project.configurations.integrationTestCompile ] + } + } + } + + project.plugins.withType(GroovyPlugin) { + project.sourceSets { + integrationTest { + groovy.srcDirs project.file('src/integration-test/groovy') + } + } + project.plugins.withType(IdeaPlugin) { + project.idea { + module { + testSourceDirs += project.file('src/integration-test/groovy') + } + } + } + } + + project.plugins.withType(PropDepsPlugin) { + project.configurations { + integrationTestCompile { + extendsFrom optional, provided + } + } + } + + project.plugins.withType(EclipsePlugin) { + project.eclipse.classpath { + plusConfigurations += [ project.configurations.integrationTestCompile ] + } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy new file mode 100644 index 000000000..900cf9f14 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy @@ -0,0 +1,41 @@ +/* + * Copyright 2016-2018 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.JavaPlugin + +/** + * Adds a version of jacoco to use and makes check depend on jacocoTestReport. + * + * @author Rob Winch + */ +class JacocoPlugin implements Plugin { + + @Override + void apply(Project project) { + project.plugins.withType(JavaPlugin) { + project.getPluginManager().apply("jacoco") + project.tasks.check.dependsOn project.tasks.jacocoTestReport + + project.jacoco { + toolVersion = '0.8.2' + } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy new file mode 100644 index 000000000..fc18e4e7a --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy @@ -0,0 +1,105 @@ +/* + * Copyright 2002-2016 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention; + +import java.io.File; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.regex.Pattern; + +import org.gradle.api.Action; +import org.gradle.api.Plugin; +import org.gradle.api.Project; +import org.gradle.api.plugins.JavaPluginConvention; +import org.gradle.api.tasks.SourceSet; +import org.gradle.api.tasks.javadoc.Javadoc; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * @author Rob Winch + */ +public class JavadocApiPlugin implements Plugin { + Logger logger = LoggerFactory.getLogger(getClass()); + Set excludes = Collections.singleton(Pattern.compile("test")); + + @Override + public void apply(Project project) { + logger.info("Applied"); + Project rootProject = project.getRootProject(); + + + //Task docs = project.getTasks().findByPath("docs") ?: project.getTasks().create("docs"); + Javadoc api = project.getTasks().create("api", Javadoc); + + api.setGroup("Documentation"); + api.setDescription("Generates aggregated Javadoc API documentation."); + + Set subprojects = rootProject.getSubprojects(); + for (Project subproject : subprojects) { + addProject(api, subproject); + } + + if (subprojects.isEmpty()) { + addProject(api, project); + } + + api.setMaxMemory("1024m"); + api.setDestinationDir(new File(project.getBuildDir(), "api")); + + project.getPluginManager().apply("io.spring.convention.javadoc-options"); + } + + public void setExcludes(String... excludes) { + if(excludes == null) { + this.excludes = Collections.emptySet(); + } + this.excludes = new HashSet(excludes.length); + for(String exclude : excludes) { + this.excludes.add(Pattern.compile(exclude)); + } + } + + private void addProject(final Javadoc api, final Project project) { + for(Pattern exclude : excludes) { + if(exclude.matcher(project.getName()).matches()) { + logger.info("Skipping {} because it is excluded by {}", project, exclude); + return; + } + } + logger.info("Try add sources for {}", project); + project.getPlugins().withType(SpringModulePlugin.class).all(new Action() { + @Override + public void execute(SpringModulePlugin plugin) { + logger.info("Added sources for {}", project); + + JavaPluginConvention java = project.getConvention().getPlugin(JavaPluginConvention.class); + SourceSet mainSourceSet = java.getSourceSets().getByName("main"); + + api.setSource(api.getSource().plus(mainSourceSet.getAllJava())); + project.getTasks().withType(Javadoc.class).all(new Action() { + @Override + public void execute(Javadoc projectJavadoc) { + api.setClasspath(api.getClasspath().plus(projectJavadoc.getClasspath())); + } + }); + } + }); + } +} + diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocOptionsPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocOptionsPlugin.groovy new file mode 100644 index 000000000..e0fef7ecb --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocOptionsPlugin.groovy @@ -0,0 +1,15 @@ +package io.spring.gradle.convention + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.tasks.javadoc.Javadoc + +public class JavadocOptionsPlugin implements Plugin { + + @Override + public void apply(Project project) { + project.getTasks().withType(Javadoc).all { t-> + t.options.addStringOption('Xdoclint:none', '-quiet') + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/ManagementConfigurationPlugin.java b/buildSrc/src/main/groovy/io/spring/gradle/convention/ManagementConfigurationPlugin.java new file mode 100644 index 000000000..8631723e3 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/ManagementConfigurationPlugin.java @@ -0,0 +1,33 @@ +package io.spring.gradle.convention; + +import org.gradle.api.Action; +import org.gradle.api.Plugin; +import org.gradle.api.Project; +import org.gradle.api.artifacts.Configuration; + +/** + * https://github.com/gradle/gradle/issues/7576#issuecomment-434637595 + * @author Rob Winch + */ +public class ManagementConfigurationPlugin implements Plugin { + @Override + public void apply(Project project) { + Configuration management = project.getConfigurations() + .create("management", new Action() { + @Override + public void execute(Configuration configuration) { + configuration.setCanBeResolved(false); + configuration.setCanBeConsumed(false); + configuration.setDescription("Used for setting Gradle constraints that impact all configurations that can be resolved"); + } + }); + project.getConfigurations().all(new Action() { + @Override + public void execute(Configuration configuration) { + if (configuration.isCanBeResolved()) { + configuration.extendsFrom(management); + } + } + }); + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy new file mode 100644 index 000000000..92ce552fe --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy @@ -0,0 +1,54 @@ +package io.spring.gradle.convention + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.plugins.MavenPlugin +import org.gradle.plugins.signing.SigningPlugin +import org.sonarqube.gradle.SonarQubePlugin + +public class MavenBomPlugin implements Plugin { + static String MAVEN_BOM_TASK_NAME = "mavenBom" + + public void apply(Project project) { + project.configurations { + archives + } + project.plugins.apply('io.spring.convention.artifactory') + project.plugins.apply('io.spring.convention.maven') + project.plugins.apply(MavenPlugin) + project.plugins.apply(SigningPlugin) + project.plugins.apply("io.spring.convention.ossrh") + + project.group = project.rootProject.group + project.task(MAVEN_BOM_TASK_NAME, type: MavenBomTask, group: 'Generate', description: 'Configures the pom as a Maven Build of Materials (BOM)') + project.install.dependsOn project.mavenBom + project.tasks.uploadArchives.dependsOn project.mavenBom + project.tasks.artifactoryPublish.dependsOn project.mavenBom + + project.plugins.withType(SonarQubePlugin) { + project.sonarqube.skipProject = true + } + + project.rootProject.allprojects.each { p -> + p.plugins.withType(io.spring.gradle.convention.SpringMavenPlugin) { + if (!project.name.equals(p.name)) { + project.mavenBom.projects.add(p) + } + } + } + + def deployArtifacts = project.task("deployArtifacts") + deployArtifacts.group = 'Deploy tasks' + deployArtifacts.description = "Deploys the artifacts to either Artifactor or Maven Central" + if(Utils.isRelease(project)) { + deployArtifacts.dependsOn project.tasks.uploadArchives + } else { + deployArtifacts.dependsOn project.tasks.artifactoryPublish + } + + project.artifacts { + archives project.mavenBom.bomFile + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomTask.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomTask.groovy new file mode 100644 index 000000000..beaf4acfb --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomTask.groovy @@ -0,0 +1,87 @@ +package io.spring.gradle.convention + +import org.gradle.api.DefaultTask +import org.gradle.api.Project +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.Internal +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction + +public class MavenBomTask extends DefaultTask { + + @Internal + Set projects = [] + + @OutputFile + File bomFile + + @Input + Set getProjectNames() { + return projects*.name as Set + } + + public MavenBomTask() { + this.group = "Generate" + this.description = "Generates a Maven Build of Materials (BOM). See https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies" + this.projects = project.subprojects + this.bomFile = project.file("${->project.buildDir}/maven-bom/${->project.name}-${->project.version}.txt") + this.outputs.upToDateWhen { false } + } + + @TaskAction + public void configureBom() { +// project.configurations.archives.artifacts.clear() + bomFile.parentFile.mkdirs() + bomFile.write("Maven Build of Materials (BOM). See https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies") + project.artifacts { + // work around GRADLE-2406 by attaching text artifact + archives(bomFile) + } + project.install { + repositories.mavenInstaller { + pom.whenConfigured { + packaging = "pom" + withXml { + asNode().children().last() + { + delegate.dependencyManagement { + delegate.dependencies { + projects.sort { dep -> "$dep.group:$dep.name" }.each { p -> + + delegate.dependency { + delegate.groupId(p.group) + delegate.artifactId(p.name) + delegate.version(p.version) + } + } + } + } + } + } + } + } + } + project.uploadArchives { + repositories.mavenDeployer { + pom.whenConfigured { + packaging = "pom" + withXml { + asNode().children().last() + { + delegate.dependencyManagement { + delegate.dependencies { + projects.sort { dep -> "$dep.group:$dep.name" }.each { p -> + + delegate.dependency { + delegate.groupId(p.group) + delegate.artifactId(p.name) + delegate.version(p.version) + } + } + } + } + } + } + } + } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/MergePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/MergePlugin.groovy new file mode 100644 index 000000000..cd7e61c57 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/MergePlugin.groovy @@ -0,0 +1,182 @@ +/* + * Copyright 2002-2015 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring.gradle.convention + +import org.gradle.api.* +import org.gradle.api.artifacts.Configuration +import org.gradle.api.artifacts.ProjectDependency; +import org.gradle.api.artifacts.maven.Conf2ScopeMapping +import org.gradle.api.plugins.MavenPlugin +import org.gradle.plugins.ide.eclipse.EclipsePlugin +import org.gradle.plugins.ide.idea.IdeaPlugin +import org.gradle.api.invocation.* + +/** + * Gradle plugin that allows projects to merged together. Primarily developed to + * allow Spring to support multiple incompatible versions of third-party + * dependencies (for example Hibernate v3 and v4). + *

+ * The 'merge' extension should be used to define how projects are merged, for example: + * 

+ * configure(subprojects) {
+ *     apply plugin: MergePlugin
+ * }
+ *
+ * project("myproject") {
+ * }
+ *
+ * project("myproject-extra") {
+ *     merge.into = project("myproject")
+ * }
+ *
+ *

+ * This plugin adds two new configurations: + *

    + *
  • merging - Contains the projects being merged into this project
  • + *
  • runtimeMerge - Contains all dependencies that are merge projects. These are used + * to allow an IDE to reference merge projects.
    • + *
      + * + * @author Rob Winch + * @author Phillip Webb + */ +class MergePlugin implements Plugin { + + private static boolean attachedProjectsEvaluated; + + public void apply(Project project) { + project.plugins.apply(MavenPlugin) + project.plugins.apply(EclipsePlugin) + project.plugins.apply(IdeaPlugin) + + MergeModel model = project.extensions.create("merge", MergeModel) + model.project = project + project.configurations.create("merging") + Configuration runtimeMerge = project.configurations.create("runtimeMerge") + + // Ensure the IDE can reference merged projects + project.eclipse.classpath.plusConfigurations += [ runtimeMerge ] + project.idea.module.scopes.PROVIDED.plus += [ runtimeMerge ] + + // Hook to perform the actual merge logic + project.afterEvaluate{ + if (it.merge.into != null) { + setup(it) + } + setupIdeDependencies(it) + } + + // Hook to build runtimeMerge dependencies + if (!attachedProjectsEvaluated) { + project.gradle.projectsEvaluated{ + postProcessProjects(it) + } + attachedProjectsEvaluated = true; + } + } + + private void setup(Project project) { + project.merge.into.dependencies.add("merging", project) + project.dependencies.add("provided", project.merge.into.sourceSets.main.output) + project.dependencies.add("runtimeMerge", project.merge.into) + setupTaskDependencies(project) + setupMaven(project) + } + + private void setupTaskDependencies(Project project) { + // invoking a task will invoke the task with the same name on 'into' project + ["sourcesJar", "jar", "javadocJar", "javadoc", "install", "artifactoryPublish", "signArchives", "uploadArchives"].each { + def task = project.tasks.findByPath(it) + if (task) { + task.enabled = false + task.dependsOn(project.merge.into.tasks.findByPath(it)) + } + } + + // update 'into' project artifacts to contain the source artifact contents + project.merge.into.sourcesJar.from(project.sourcesJar.source) + project.merge.into.jar.from(project.sourceSets.main.output) + project.merge.into.javadoc { + source += project.javadoc.source + classpath += project.javadoc.classpath + } + } + + private void setupIdeDependencies(Project project) { + project.configurations.each { c -> + c.dependencies.findAll( { it instanceof org.gradle.api.artifacts.ProjectDependency } ).each { d -> + if(d.dependencyProject.hasProperty("merge")) { + d.dependencyProject.merge.from.each { from -> + project.dependencies.add("runtimeMerge", from) + } + } + } + } + } + + private void setupMaven(Project project) { + project.configurations.each { configuration -> + Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration]) + if (mapping.scope) { + Configuration intoConfiguration = project.merge.into.configurations.create( + project.name + "-" + configuration.name) + configuration.excludeRules.each { + configuration.exclude([ + (ExcludeRule.GROUP_KEY) : it.group, + (ExcludeRule.MODULE_KEY) : it.module]) + } + configuration.dependencies.each { + def intoCompile = project.merge.into.configurations.getByName("compile") + // Protect against changing a compile scope dependency (SPR-10218) + if (!intoCompile.dependencies.contains(it)) { + intoConfiguration.dependencies.add(it) + } + } + def index = project.parent.childProjects.findIndexOf {p -> p.getValue() == project} + project.merge.into.install.repositories.mavenInstaller.pom.scopeMappings.addMapping( + mapping.priority + 100 + index, intoConfiguration, mapping.scope) + } + } + } + + private postProcessProjects(Gradle gradle) { + gradle.allprojects(new Action() { + public void execute(Project project) { + if(!project.hasProperty("merge")) { + return + } + project.configurations.getByName("runtime")?.allDependencies?.withType(ProjectDependency)?.each{ + Configuration dependsOnMergedFrom = it.dependencyProject.configurations.getByName("merging"); + dependsOnMergedFrom.dependencies.each{ dep -> + project.dependencies.add("runtimeMerge", dep.dependencyProject) + } + } + } + }); + } +} + +class MergeModel { + Project project; + Project into; + List from = []; + + public void setInto(Project into) { + this.into = into; + into.merge.from.add(project); + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/OssrhPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/OssrhPlugin.groovy new file mode 100644 index 000000000..6a6748c1a --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/OssrhPlugin.groovy @@ -0,0 +1,41 @@ +package io.spring.gradle.convention + +import org.gradle.api.Plugin +import org.gradle.api.Project + +public class OssrhPlugin implements Plugin { + + @Override + public void apply(Project project) { + if(project.hasProperty('ossrhUsername')) { + project.uploadArchives { + repositories { + mavenDeployer { + repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { + authentication(userName: project.ossrhUsername, password: project.ossrhPassword) + } + + snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { + authentication(userName: project.ossrhUsername, password: project.ossrhPassword) + } + } + } + } + } + if(project.hasProperty('ossrhTokenUsername')) { + project.uploadArchives { + repositories { + mavenDeployer { + repository(url: "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") { + authentication(userName: project.ossrhTokenUsername, password: project.ossrhTokenPassword) + } + + snapshotRepository(url: "https://s01.oss.sonatype.org/content/repositories/snapshots/") { + authentication(userName: project.ossrhTokenUsername, password: project.ossrhTokenPassword) + } + } + } + } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy new file mode 100644 index 000000000..4fb23b34a --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy @@ -0,0 +1,80 @@ +/* + * Copyright 2016-2018 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention; + +import org.gradle.api.Plugin +import org.gradle.api.Project + +class RepositoryConventionPlugin implements Plugin { + + @Override + void apply(Project project) { + String[] forceMavenRepositories = ((String) project.findProperty("forceMavenRepositories"))?.split(',') + boolean isImplicitSnapshotRepository = forceMavenRepositories == null && Utils.isSnapshot(project) + boolean isImplicitMilestoneRepository = forceMavenRepositories == null && Utils.isMilestone(project) + + boolean isSnapshot = isImplicitSnapshotRepository || forceMavenRepositories?.contains('snapshot') + boolean isMilestone = isImplicitMilestoneRepository || forceMavenRepositories?.contains('milestone') + + project.repositories { + if (forceMavenRepositories?.contains('local')) { + mavenLocal() + } + mavenCentral() + jcenter() { + content { + includeGroup "org.gretty" + } + } + if (isSnapshot) { + maven { + name = 'artifactory-snapshot' + if (project.hasProperty('artifactoryUsername')) { + credentials { + username project.artifactoryUsername + password project.artifactoryPassword + } + } + url = 'https://repo.spring.io/snapshot/' + } + } + if (isSnapshot || isMilestone) { + maven { + name = 'artifactory-milestone' + if (project.hasProperty('artifactoryUsername')) { + credentials { + username project.artifactoryUsername + password project.artifactoryPassword + } + } + url = 'https://repo.spring.io/milestone/' + } + } + maven { + name = 'artifactory-release' + if (project.hasProperty('artifactoryUsername')) { + credentials { + username project.artifactoryUsername + password project.artifactoryPassword + } + } + url = 'https://repo.spring.io/release/' + } + } + } + +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy new file mode 100644 index 000000000..843d5b57c --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy @@ -0,0 +1,78 @@ +/* + * Copyright 2016-2019 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention + +import io.spring.nohttp.gradle.NoHttpPlugin +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.BasePlugin +import org.gradle.api.plugins.PluginManager + +class RootProjectPlugin implements Plugin { + + @Override + void apply(Project project) { + PluginManager pluginManager = project.getPluginManager() + pluginManager.apply(BasePlugin) + pluginManager.apply(SchemaPlugin) + pluginManager.apply(NoHttpPlugin) + pluginManager.apply("org.sonarqube") + + project.repositories.mavenCentral() + + project.allprojects { + configurations.all { + resolutionStrategy { + cacheChangingModulesFor 0, "seconds" + cacheDynamicVersionsFor 0, "seconds" + } + } + } + + String projectName = Utils.getProjectName(project) + project.sonarqube { + properties { + property "sonar.java.coveragePlugin", "jacoco" + property "sonar.projectName", projectName + property "sonar.jacoco.reportPath", "${project.buildDir.name}/jacoco.exec" + property "sonar.links.homepage", "https://spring.io/${projectName}" + property "sonar.links.ci", "https://jenkins.spring.io/job/${projectName}/" + property "sonar.links.issue", "https://github.com/spring-projects/${projectName}/issues" + property "sonar.links.scm", "https://github.com/spring-projects/${projectName}" + property "sonar.links.scm_dev", "https://github.com/spring-projects/${projectName}.git" + } + } + + project.tasks.create("dependencyManagementExport", DependencyManagementExportTask) + + def finalizeDeployArtifacts = project.task("finalizeDeployArtifacts") + if (Utils.isRelease(project) && project.hasProperty("ossrhUsername")) { + project.ext.nexusUsername = project.ossrhUsername + project.ext.nexusPassword = project.ossrhPassword + project.getPluginManager().apply("io.codearte.nexus-staging") + finalizeDeployArtifacts.dependsOn project.tasks.closeAndReleaseRepository + project.nexusStaging { + packageGroup = 'org.springframework' + + // try for 5 minutes total + numberOfRetries = 60 // default is 20 + delayBetweenRetriesInMillis = 5000 // default is 2000 + } + } + } + +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy new file mode 100644 index 000000000..4b9c038db --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy @@ -0,0 +1,71 @@ +package io.spring.gradle.convention + +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.tasks.bundling.Zip +import org.gradle.api.Plugin +import org.gradle.api.Project + +public class SchemaDeployPlugin implements Plugin { + + @Override + public void apply(Project project) { + project.getPluginManager().apply('org.hidetake.ssh') + + project.ssh.settings { + knownHosts = allowAnyHosts + } + project.remotes { + docs { + role 'docs' + if (project.hasProperty('deployDocsHost')) { + host = project.findProperty('deployDocsHost') + } else { + host = 'docs.af.pivotal.io' + } + retryCount = 5 // retry 5 times (default is 0) + retryWaitSec = 10 // wait 10 seconds between retries (default is 0) + user = project.findProperty('deployDocsSshUsername') + if(project.hasProperty('deployDocsSshKeyPath')) { + identity = project.file(project.findProperty('deployDocsSshKeyPath')) + } else if (project.hasProperty('deployDocsSshKey')) { + identity = project.findProperty('deployDocsSshKey') + } + if(project.hasProperty('deployDocsSshPassphrase')) { + passphrase = project.findProperty('deployDocsSshPassphrase') + } + } + } + + project.task('deploySchema') { + dependsOn 'schemaZip' + doFirst { + project.ssh.run { + session(project.remotes.docs) { + def now = System.currentTimeMillis() + def name = project.rootProject.name + def version = project.rootProject.version + def tempPath = "/tmp/${name}-${now}-schema/".replaceAll(' ', '_') + + execute "mkdir -p $tempPath" + + project.tasks.schemaZip.outputs.each { o -> + println "Putting $o.files" + put from: o.files, into: tempPath + } + + execute "unzip $tempPath*.zip -d $tempPath" + + def extractPath = "/var/www/domains/spring.io/docs/htdocs/autorepo/schema/${name}/${version}/" + + execute "rm -rf $extractPath" + execute "mkdir -p $extractPath" + execute "rm -f $tempPath*.zip" + execute "rm -rf $extractPath*" + execute "mv $tempPath/* $extractPath" + execute "chmod -R g+w $extractPath" + } + } + } + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaPlugin.groovy new file mode 100644 index 000000000..769ae80d1 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaPlugin.groovy @@ -0,0 +1,15 @@ +package io.spring.gradle.convention + +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.tasks.bundling.Zip +import org.gradle.api.Plugin +import org.gradle.api.Project + +public class SchemaPlugin implements Plugin { + + @Override + public void apply(Project project) { + project.getPluginManager().apply(SchemaZipPlugin) + project.getPluginManager().apply(SchemaDeployPlugin) + } +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy new file mode 100644 index 000000000..167545be9 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy @@ -0,0 +1,43 @@ +package io.spring.gradle.convention + +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.tasks.bundling.Zip +import org.gradle.api.Plugin +import org.gradle.api.Project + +public class SchemaZipPlugin implements Plugin { + + @Override + public void apply(Project project) { + Zip schemaZip = project.tasks.create('schemaZip', Zip) + schemaZip.group = 'Distribution' + schemaZip.baseName = project.rootProject.name + schemaZip.classifier = 'schema' + schemaZip.description = "Builds -${schemaZip.classifier} archive containing all " + + "XSDs for deployment at static.springframework.org/schema." + + project.rootProject.subprojects.each { module -> + + module.getPlugins().withType(JavaPlugin.class).all { + def Properties schemas = new Properties(); + + module.sourceSets.main.resources.find { + it.path.endsWith('META-INF/spring.schemas') + }?.withInputStream { schemas.load(it) } + + for (def key : schemas.keySet()) { + def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1') + assert shortName != key + File xsdFile = module.sourceSets.main.resources.find { + it.path.endsWith(schemas.get(key)) + } + assert xsdFile != null + schemaZip.into (shortName) { + duplicatesStrategy 'exclude' + from xsdFile.path + } + } + } + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy new file mode 100644 index 000000000..5b950d83d --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy @@ -0,0 +1,52 @@ +/* + * Copyright 2002-2017 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.spring.gradle.convention; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Enumeration; +import java.util.List; +import java.util.Properties; + +/** + * A Properties which sorts they keys so that they can be written to a File with + * the keys sorted. + * + * @author Rob Winch + * + */ +class SortedProperties extends Properties { + private static final long serialVersionUID = -6199017589626540836L; + + public Enumeration keys() { + Enumeration keysEnum = super.keys(); + List keyList = new ArrayList(); + + while (keysEnum.hasMoreElements()) { + keyList.add(keysEnum.nextElement()); + } + + Collections.sort(keyList, new Comparator() { + @Override + public int compare(Object o1, Object o2) { + return o1.toString().compareTo(o2.toString()); + } + }); + + return Collections.enumeration(keyList); + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionPlugin.groovy new file mode 100644 index 000000000..19df0e7d8 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionPlugin.groovy @@ -0,0 +1,54 @@ +/* + * Copyright 2016-2019 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention + +import io.spring.gradle.dependencymanagement.DependencyManagementPlugin +import org.gradle.api.Plugin +import org.gradle.api.Project + +/** + * Adds and configures {@link DependencyManagementPlugin}. + *

      + * Additionally, if 'gradle/dependency-management.gradle' file is present it will be + * automatically applied file for configuring the dependencies. + */ +class SpringDependencyManagementConventionPlugin implements Plugin { + + static final String DEPENDENCY_MANAGEMENT_RESOURCE = "gradle/dependency-management.gradle" + + @Override + void apply(Project project) { + project.getPluginManager().apply(ManagementConfigurationPlugin) + project.getPluginManager().apply(DependencyManagementPlugin) + project.dependencyManagement { + resolutionStrategy { + cacheChangingModulesFor 0, "seconds" + } + } + File rootDir = project.rootDir + List dependencyManagementFiles = [project.rootProject.file(DEPENDENCY_MANAGEMENT_RESOURCE)] + for (File dir = project.projectDir; dir != rootDir; dir = dir.parentFile) { + dependencyManagementFiles.add(new File(dir, DEPENDENCY_MANAGEMENT_RESOURCE)) + } + dependencyManagementFiles.each { f -> + if (f.exists()) { + project.apply from: f.absolutePath + } + } + } + +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringMavenPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringMavenPlugin.groovy new file mode 100644 index 000000000..a8d9be270 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringMavenPlugin.groovy @@ -0,0 +1,221 @@ +package io.spring.gradle.convention + +import io.spring.gradle.dependencymanagement.DependencyManagementPlugin +import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension +import io.spring.gradle.dependencymanagement.dsl.GeneratedPomCustomizationHandler +import org.gradle.api.Action +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.XmlProvider +import org.gradle.api.artifacts.component.ModuleComponentSelector +import org.gradle.api.artifacts.maven.MavenDeployment +import org.gradle.api.artifacts.maven.MavenPom +import org.gradle.api.artifacts.result.ResolvedDependencyResult +import org.gradle.api.plugins.JavaBasePlugin +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.plugins.JavaPluginConvention +import org.gradle.api.plugins.MavenPlugin +import org.gradle.api.tasks.SourceSet +import org.gradle.api.tasks.bundling.Jar +import org.gradle.api.tasks.javadoc.Javadoc +import org.gradle.plugins.signing.SigningPlugin +import org.slf4j.Logger +import org.slf4j.LoggerFactory + +public class SpringMavenPlugin implements Plugin { + private static final String ARCHIVES = "archives"; + Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public void apply(Project project) { + project.getPluginManager().apply(JavaPlugin.class); + project.getPluginManager().apply(MavenPlugin.class); + project.getPluginManager().apply(SigningPlugin.class); + + Javadoc javadoc = (Javadoc) project.getTasks().findByPath("javadoc"); + Jar javadocJar = project.getTasks().create("javadocJar", Jar.class); + javadocJar.setClassifier("javadoc"); + javadocJar.from(javadoc); + + JavaPluginConvention java = project.getConvention().getPlugin(JavaPluginConvention.class); + SourceSet mainSourceSet = java.getSourceSets().getByName("main"); + Jar sourcesJar = project.getTasks().create("sourcesJar", Jar.class); + sourcesJar.setClassifier("sources"); + sourcesJar.from(mainSourceSet.getAllSource()); + + project.getArtifacts().add(ARCHIVES, javadocJar); + project.getArtifacts().add(ARCHIVES, sourcesJar); + + project.install { + repositories.mavenInstaller { + configurePom(project, pom) + } + } + project.uploadArchives { + repositories.mavenDeployer { + configurePom(project, pom) + } + } + + project.plugins.withType(DependencyManagementPlugin) { + inlineDependencyManagement(project); + } + + def hasSigningKey = project.hasProperty("signing.keyId") || project.findProperty("signingKey") + if(hasSigningKey && Utils.isRelease(project)) { + sign(project) + } + + project.getPluginManager().apply("io.spring.convention.ossrh"); + } + + private void inlineDependencyManagement(Project project) { + final DependencyManagementExtension dependencyManagement = project.getExtensions().findByType(DependencyManagementExtension.class); + dependencyManagement.generatedPomCustomization( { handler -> handler.setEnabled(false) }); + + project.install { + repositories.mavenInstaller { + configurePomForInlineDependencies(project, pom) + } + } + project.uploadArchives { + repositories.mavenDeployer { + configurePomForInlineDependencies(project, pom) + } + } + } + + private void configurePomForInlineDependencies(Project project, MavenPom pom) { + pom.withXml { XmlProvider xml -> + project.plugins.withType(JavaBasePlugin) { + def dependencies = xml.asNode()?.dependencies?.dependency + def configuredDependencies = project.configurations.findAll{ it.canBeResolved }*.incoming*.resolutionResult*.allDependencies.flatten() + dependencies?.each { Node dep -> + def group = dep.groupId.text() + def name = dep.artifactId.text() + + ResolvedDependencyResult resolved = configuredDependencies.find { r -> + (r.requested instanceof ModuleComponentSelector) && + (r.requested.group == group) && + (r.requested.module == name) + } + + if (!resolved) { + return + } + + def versionNode = dep.version + if (!versionNode) { + dep.appendNode('version') + } + def moduleVersion = resolved.selected.moduleVersion + dep.groupId[0].value = moduleVersion.group + dep.artifactId[0].value = moduleVersion.name + dep.version[0].value = moduleVersion.version + } + } + } + } + + private void sign(Project project) { + project.install { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> project.signing.signPom(deployment) } + } + } + } + + project.uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> project.signing.signPom(deployment) } + } + } + } + + project.signing { + required { project.gradle.taskGraph.hasTask("uploadArchives") } + def signingKeyId = project.findProperty("signingKeyId") + def signingKey = project.findProperty("signingKey") + def signingPassword = project.findProperty("signingPassword") + if (signingKeyId) { + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) + } else if (signingKey) { + useInMemoryPgpKeys(signingKey, signingPassword) + } + sign project.configurations.archives + } + } + + private static void configurePom(Project project, MavenPom pom) { + pom.whenConfigured { p -> + p.dependencies = p.dependencies.sort { dep -> + "$dep.scope:$dep.optional:$dep.groupId:$dep.artifactId" + } + } + + pom.project { + boolean isWar = project.hasProperty("war"); + String projectVersion = String.valueOf(project.getVersion()); + String projectName = Utils.getProjectName(project); + + if(isWar) { + packaging = "war" + } + name = project.name + description = project.name + url = 'https://spring.io/spring-security' + organization { + name = 'spring.io' + url = 'https://spring.io/' + } + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'https://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + scm { + url = 'https://github.com/spring-projects/spring-security' + connection = 'scm:git:git://github.com/spring-projects/spring-security' + developerConnection = 'scm:git:git://github.com/spring-projects/spring-security' + } + developers { + developer { + id = 'rwinch' + name = 'Rob Winch' + email = 'rwinch@pivotal.io' + } + developer { + id = 'jgrandja' + name = 'Joe Grandja' + email = 'jgrandja@pivotal.io' + } + } + + if(isWar) { + properties { + 'm2eclipse.wtp.contextRoot' '/' + } + } + if (Utils.isSnapshot(project)) { + repositories { + repository { + id 'spring-snapshot' + url 'https://repo.spring.io/snapshot' + } + } + } + else if (Utils.isMilestone(project)) { + repositories { + repository { + id 'spring-milestone' + url 'https://repo.spring.io/milestone' + } + } + } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy new file mode 100644 index 000000000..5c509e918 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy @@ -0,0 +1,50 @@ +/* + * Copyright 2016-2019 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention; + +import org.gradle.api.Project +import org.gradle.api.plugins.JavaLibraryPlugin; +import org.gradle.api.plugins.MavenPlugin; +import org.gradle.api.plugins.PluginManager; + +/** + * @author Rob Winch + */ +class SpringModulePlugin extends AbstractSpringJavaPlugin { + + @Override + void additionalPlugins(Project project) { + PluginManager pluginManager = project.getPluginManager(); + pluginManager.apply(JavaLibraryPlugin.class) + pluginManager.apply(MavenPlugin.class); + pluginManager.apply("io.spring.convention.maven"); + pluginManager.apply("io.spring.convention.artifactory"); + pluginManager.apply("io.spring.convention.jacoco"); + pluginManager.apply("io.spring.convention.merge"); + + def deployArtifacts = project.task("deployArtifacts") + deployArtifacts.group = 'Deploy tasks' + deployArtifacts.description = "Deploys the artifacts to either Artifactory or Maven Central" + if (Utils.isRelease(project)) { + deployArtifacts.dependsOn project.tasks.uploadArchives + } + else { + deployArtifacts.dependsOn project.tasks.artifactoryPublish + } + } + +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringPomPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringPomPlugin.groovy new file mode 100644 index 000000000..955914c54 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringPomPlugin.groovy @@ -0,0 +1,24 @@ +/* + * Copyright 2002-2016 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention; + +/** + * @author Rob Winch + */ +public class SpringPomPlugin extends SpringModulePlugin { + +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy new file mode 100644 index 000000000..2d7ee845e --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy @@ -0,0 +1,43 @@ +/* + * Copyright 2002-2016 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention; + +import org.gradle.api.Project; +import org.gradle.api.plugins.PluginManager; +import org.gradle.api.plugins.WarPlugin +import org.gradle.api.plugins.JavaPlugin; +import org.gradle.api.tasks.testing.Test + +/** + * @author Rob Winch + */ +public class SpringSampleBootPlugin extends SpringSamplePlugin { + + @Override + public void additionalPlugins(Project project) { + super.additionalPlugins(project); + + PluginManager pluginManager = project.getPluginManager(); + + pluginManager.apply("org.springframework.boot"); + + project.repositories { + maven { url 'https://repo.spring.io/snapshot' } + maven { url 'https://repo.spring.io/milestone' } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy new file mode 100644 index 000000000..37ae6cfb3 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy @@ -0,0 +1,33 @@ +/* + * Copyright 2002-2016 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention; + +import org.gradle.api.Project +import org.sonarqube.gradle.SonarQubePlugin; + +/** + * @author Rob Winch + */ +public class SpringSamplePlugin extends AbstractSpringJavaPlugin { + + @Override + public void additionalPlugins(Project project) { + project.plugins.withType(SonarQubePlugin) { + project.sonarqube.skipProject = true + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy new file mode 100644 index 000000000..59bb1545c --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy @@ -0,0 +1,97 @@ +/* + * Copyright 2016-2018 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention + +import org.gradle.api.Project +import org.gradle.api.Task +import org.gradle.api.plugins.PluginManager +import org.gradle.api.tasks.testing.Test + +/** + * @author Rob Winch + */ +public class SpringSampleWarPlugin extends SpringSamplePlugin { + + @Override + public void additionalPlugins(Project project) { + super.additionalPlugins(project); + + PluginManager pluginManager = project.getPluginManager(); + + pluginManager.apply("war"); + pluginManager.apply("org.gretty"); + + project.gretty { + servletContainer = 'tomcat85' + contextPath = '/' + fileLogEnabled = false + } + + Task prepareAppServerForIntegrationTests = project.tasks.create('prepareAppServerForIntegrationTests') { + group = 'Verification' + description = 'Prepares the app server for integration tests' + doFirst { + project.gretty { + httpPort = getRandomFreePort() + httpsPort = getRandomPort() + } + } + } + project.tasks.withType(org.akhikhl.gretty.AppBeforeIntegrationTestTask).all { task -> + task.dependsOn prepareAppServerForIntegrationTests + } + + project.tasks.withType(Test).all { task -> + if("integrationTest".equals(task.name)) { + applyForIntegrationTest(project, task) + } + } + } + + def applyForIntegrationTest(Project project, Task integrationTest) { + project.gretty.integrationTestTask = integrationTest.name + + integrationTest.doFirst { + def gretty = project.gretty + String host = project.gretty.host ?: 'localhost' + boolean isHttps = gretty.httpsEnabled + Integer httpPort = integrationTest.systemProperties['gretty.httpPort'] + Integer httpsPort = integrationTest.systemProperties['gretty.httpsPort'] + int port = isHttps ? httpsPort : httpPort + String contextPath = project.gretty.contextPath + String httpBaseUrl = "http://${host}:${httpPort}${contextPath}" + String httpsBaseUrl = "https://${host}:${httpsPort}${contextPath}" + String baseUrl = isHttps ? httpsBaseUrl : httpBaseUrl + integrationTest.systemProperty 'app.port', port + integrationTest.systemProperty 'app.httpPort', httpPort + integrationTest.systemProperty 'app.httpsPort', httpsPort + integrationTest.systemProperty 'app.baseURI', baseUrl + integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl + integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl + + integrationTest.systemProperty 'geb.build.baseUrl', baseUrl + integrationTest.systemProperty 'geb.build.reportsDir', 'build/geb-reports' + } + } + + def getRandomPort() { + ServerSocket ss = new ServerSocket(0) + int port = ss.localPort + ss.close() + return port + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy new file mode 100644 index 000000000..55807dc0f --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy @@ -0,0 +1,30 @@ +/* + * Copyright 2002-2016 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package io.spring.gradle.convention; + +import org.gradle.api.Project; + +/** + * @author Rob Winch + */ +public class SpringTestPlugin extends AbstractSpringJavaPlugin { + + @Override + public void additionalPlugins(Project project) { + project.sonarqube.skipProject = true + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy new file mode 100644 index 000000000..6ad45d0a1 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy @@ -0,0 +1,54 @@ +/* + * Copyright 2002-2017 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. You may obtain a copy of + * the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package io.spring.gradle.convention; + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.JavaPlugin +import org.gradle.jvm.tasks.Jar + +/** + * Adds the ability to depends on the test jar within other projects using: + * + * + * testCompile project(path: ':foo', configuration: 'tests') + * + * + * @author Rob Winch + */ +public class TestsConfigurationPlugin implements Plugin { + @Override + public void apply(Project project) { + project.plugins.withType(JavaPlugin) { + applyJavaProject(project) + } + } + + private void applyJavaProject(Project project) { + project.configurations { + tests.extendsFrom testRuntime + } + + project.tasks.create('testJar', Jar) { + classifier = 'test' + from project.sourceSets.test.output + } + + project.artifacts { + tests project.testJar + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/Utils.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/Utils.groovy new file mode 100644 index 000000000..8f5a6a906 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/Utils.groovy @@ -0,0 +1,34 @@ +package io.spring.gradle.convention; + +import org.gradle.api.Project; + +public class Utils { + + static String getProjectName(Project project) { + String projectName = project.getRootProject().getName(); + if(projectName.endsWith("-build")) { + projectName = projectName.substring(0, projectName.length() - "-build".length()); + } + return projectName; + } + + static boolean isSnapshot(Project project) { + String projectVersion = projectVersion(project) + return projectVersion.matches('^.*([.-]BUILD)?-SNAPSHOT$') + } + + static boolean isMilestone(Project project) { + String projectVersion = projectVersion(project) + return projectVersion.matches('^.*[.-]M\\d+$') || projectVersion.matches('^.*[.-]RC\\d+$') + } + + static boolean isRelease(Project project) { + return !(isSnapshot(project) || isMilestone(project)) + } + + private static String projectVersion(Project project) { + return String.valueOf(project.getVersion()); + } + + private Utils() {} +} diff --git a/buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java b/buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java new file mode 100644 index 000000000..548dfbca5 --- /dev/null +++ b/buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java @@ -0,0 +1,208 @@ +/* + * Copyright 2019-2020 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring.gradle.convention; + +import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider; +import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask; +import org.asciidoctor.gradle.jvm.AsciidoctorJExtension; +import org.asciidoctor.gradle.jvm.AsciidoctorJPlugin; +import org.asciidoctor.gradle.jvm.AsciidoctorTask; +import org.gradle.api.Action; +import org.gradle.api.Plugin; +import org.gradle.api.Project; +import org.gradle.api.artifacts.Configuration; +import org.gradle.api.artifacts.DependencySet; +import org.gradle.api.artifacts.dsl.RepositoryHandler; +import org.gradle.api.file.CopySpec; +import org.gradle.api.file.FileTree; +import org.gradle.api.tasks.Sync; + +import java.io.File; +import java.net.URI; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.function.Consumer; + +/** + * Conventions that are applied in the presence of the {@link AsciidoctorJPlugin}. When + * the plugin is applied: + * + *

        + *
      • All warnings are made fatal. + *
      • A task is created to resolve and unzip our documentation resources (CSS and + * Javascript). + *
      • For each {@link AsciidoctorTask} (HTML only): + *
          + *
        • A configuration named asciidoctorExtensions is ued to add the + * block + * switch extension + *
        • {@code doctype} {@link AsciidoctorTask#options(Map) option} is configured. + *
        • {@link AsciidoctorTask#attributes(Map) Attributes} are configured for syntax + * highlighting, CSS styling, docinfo, etc. + *
        + *
      • For each {@link AbstractAsciidoctorTask} (HTML and PDF): + *
          + *
        • {@link AsciidoctorTask#attributes(Map) Attributes} are configured to enable + * warnings for references to missing attributes, the year is added as @{code today-year}, + * etc + *
        • {@link AbstractAsciidoctorTask#baseDirFollowsSourceDir() baseDirFollowsSourceDir()} + * is enabled. + *
        + *
      + * + * @author Andy Wilkinson + * @author Rob Winch + */ +public class AsciidoctorConventionPlugin implements Plugin { + + public void apply(Project project) { + project.getPlugins().withType(AsciidoctorJPlugin.class, (asciidoctorPlugin) -> { + createDefaultAsciidoctorRepository(project); + makeAllWarningsFatal(project); + Sync unzipResources = createUnzipDocumentationResourcesTask(project); + project.getTasks().withType(AbstractAsciidoctorTask.class, (asciidoctorTask) -> { + asciidoctorTask.dependsOn(unzipResources); + configureExtensions(project, asciidoctorTask); + configureCommonAttributes(project, asciidoctorTask); + configureOptions(asciidoctorTask); + asciidoctorTask.baseDirFollowsSourceDir(); + asciidoctorTask.useIntermediateWorkDir(); + asciidoctorTask.resources(new Action() { + @Override + public void execute(CopySpec resourcesSpec) { + resourcesSpec.from(unzipResources); + resourcesSpec.from(asciidoctorTask.getSourceDir(), new Action() { + @Override + public void execute(CopySpec resourcesSrcDirSpec) { + // https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/523 + // For now copy the entire sourceDir over so that include files are + // available in the intermediateWorkDir + // resourcesSrcDirSpec.include("images/**"); + } + }); + } + }); + if (asciidoctorTask instanceof AsciidoctorTask) { + configureHtmlOnlyAttributes(project, asciidoctorTask); + } + }); + }); + } + + private void createDefaultAsciidoctorRepository(Project project) { + project.getGradle().afterProject(new Action() { + @Override + public void execute(Project project) { + RepositoryHandler repositories = project.getRepositories(); + if (repositories.isEmpty()) { + repositories.mavenCentral(); + repositories.maven(repo -> { + repo.setUrl(URI.create("https://repo.spring.io/release")); + }); + } + } + }); + } + + private void makeAllWarningsFatal(Project project) { + project.getExtensions().getByType(AsciidoctorJExtension.class).fatalWarnings(".*"); + } + + private void configureExtensions(Project project, AbstractAsciidoctorTask asciidoctorTask) { + Configuration extensionsConfiguration = project.getConfigurations().maybeCreate("asciidoctorExtensions"); + extensionsConfiguration.defaultDependencies(new Action() { + @Override + public void execute(DependencySet dependencies) { + dependencies.add(project.getDependencies().create("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.4.2.RELEASE")); + } + }); + asciidoctorTask.configurations(extensionsConfiguration); + } + + private Sync createUnzipDocumentationResourcesTask(Project project) { + Configuration documentationResources = project.getConfigurations().maybeCreate("documentationResources"); + documentationResources.getDependencies() + .add(project.getDependencies().create("io.spring.docresources:spring-doc-resources:0.2.5")); + Sync unzipResources = project.getTasks().create("unzipDocumentationResources", + Sync.class, new Action() { + @Override + public void execute(Sync sync) { + sync.dependsOn(documentationResources); + sync.from(new Callable>() { + @Override + public List call() throws Exception { + List result = new ArrayList<>(); + documentationResources.getAsFileTree().forEach(new Consumer() { + @Override + public void accept(File file) { + result.add(project.zipTree(file)); + } + }); + return result; + } + }); + File destination = new File(project.getBuildDir(), "docs/resources"); + sync.into(project.relativePath(destination)); + } + }); + return unzipResources; + } + + private void configureOptions(AbstractAsciidoctorTask asciidoctorTask) { + asciidoctorTask.options(Collections.singletonMap("doctype", "book")); + } + + private void configureHtmlOnlyAttributes(Project project, AbstractAsciidoctorTask asciidoctorTask) { + Map attributes = new HashMap<>(); + attributes.put("source-highlighter", "highlight.js"); + attributes.put("highlightjsdir", "js/highlight"); + attributes.put("highlightjs-theme", "github"); + attributes.put("linkcss", true); + attributes.put("icons", "font"); + attributes.put("stylesheet", "css/spring.css"); + asciidoctorTask.getAttributeProviders().add(new AsciidoctorAttributeProvider() { + @Override + public Map getAttributes() { + Object version = project.getVersion(); + Map attrs = new HashMap<>(); + if (version != null && version.toString() != Project.DEFAULT_VERSION) { + attrs.put("revnumber", version); + } + return attrs; + } + }); + asciidoctorTask.attributes(attributes); + } + + private void configureCommonAttributes(Project project, AbstractAsciidoctorTask asciidoctorTask) { + Map attributes = new HashMap<>(); + attributes.put("attribute-missing", "warn"); + attributes.put("icons", "font"); + attributes.put("idprefix", ""); + attributes.put("idseparator", "-"); + attributes.put("docinfo", "shared"); + attributes.put("sectanchors", ""); + attributes.put("sectnums", ""); + attributes.put("today-year", LocalDate.now().getYear()); + asciidoctorTask.attributes(attributes); + } +} diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.artifactory.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.artifactory.properties new file mode 100644 index 000000000..573d12813 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.artifactory.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.ArtifactoryPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.bom.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.bom.properties new file mode 100644 index 000000000..dec2e7a80 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.bom.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.MavenBomPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.checkstyle.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.checkstyle.properties new file mode 100644 index 000000000..9259a914d --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.checkstyle.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.CheckstylePlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.dependency-set.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.dependency-set.properties new file mode 100644 index 000000000..497ecd590 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.dependency-set.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.DependencySetPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.docs.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.docs.properties new file mode 100644 index 000000000..fcad41ab0 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.docs.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.DocsPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.integration-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.integration-test.properties new file mode 100644 index 000000000..0da39b330 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.integration-test.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.IntegrationTestPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.jacoco.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.jacoco.properties new file mode 100644 index 000000000..70cfb7d0d --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.jacoco.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.JacocoPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.javadoc-api.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.javadoc-api.properties new file mode 100644 index 000000000..bfb92306a --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.javadoc-api.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.JavadocApiPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.javadoc-options.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.javadoc-options.properties new file mode 100644 index 000000000..77e7832e4 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.javadoc-options.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.JavadocOptionsPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.maven.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.maven.properties new file mode 100644 index 000000000..a75655eda --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.maven.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.SpringMavenPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.merge.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.merge.properties new file mode 100644 index 000000000..47f39ec24 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.merge.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.MergePlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.ossrh.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.ossrh.properties new file mode 100644 index 000000000..567272412 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.ossrh.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.OssrhPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.repository.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.repository.properties new file mode 100644 index 000000000..b427d5521 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.repository.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.RepositoryConventionPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.root.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.root.properties new file mode 100644 index 000000000..9844db624 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.root.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.RootProjectPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-module.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-module.properties new file mode 100644 index 000000000..124dd85f9 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-module.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.SpringModulePlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-pom.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-pom.properties new file mode 100644 index 000000000..e59252be8 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-pom.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.SpringPomPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample-boot.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample-boot.properties new file mode 100644 index 000000000..6daff6d33 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample-boot.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.SpringSampleBootPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample-war.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample-war.properties new file mode 100644 index 000000000..54daa2ada --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample-war.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.SpringSampleWarPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample.properties new file mode 100644 index 000000000..24714047c --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-sample.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.SpringSamplePlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-test.properties new file mode 100644 index 000000000..4881e2d07 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.spring-test.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.SpringTestPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.springdependencymangement.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.springdependencymangement.properties new file mode 100644 index 000000000..406e5690c --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.springdependencymangement.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.SpringDependencyManagementConventionPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.tests-configuration.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.tests-configuration.properties new file mode 100644 index 000000000..afd0a712a --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.tests-configuration.properties @@ -0,0 +1 @@ +implementation-class=io.spring.gradle.convention.TestsConfigurationPlugin \ No newline at end of file From e5418a241029ca5f4d8afb3dd5e2aba5ee665273 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 13 Jun 2023 16:22:40 -0700 Subject: [PATCH 185/201] Update local Spring Build Conventions Gradle Plugins (in buildSrc/) with latest, required infrastructure changes. Required changes include, but are not limited to: * Switching from spring-doc-resources:0.2.5 to spring-asciidoctor-backends used to build documewntation. * Resolving build dependencies from Maven Central. * Importing the Spring PropDeps Gradle Plugins locally. * Refactoring the local Spring Build Conventions Gradle Plugins with the latest, state-of-art build and infrastructure practices. --- buildSrc/build.gradle | 35 ++- .../AbstractSpringJavaPlugin.groovy | 47 +-- .../gradle/convention/DocsPlugin.groovy | 13 +- .../convention/SpringMavenPlugin.groovy | 71 +++-- .../convention/SpringModulePlugin.groovy | 7 +- .../convention/SpringSampleBootPlugin.groovy | 15 +- .../convention/SpringSamplePlugin.groovy | 6 +- .../convention/SpringSampleWarPlugin.groovy | 14 +- .../propdeps/PropDepsEclipsePlugin.groovy | 45 +++ .../gradle/propdeps/PropDepsIdeaPlugin.groovy | 48 +++ .../propdeps/PropDepsMavenPlugin.groovy | 67 ++++ .../gradle/propdeps/PropDepsPlugin.groovy | 82 +++++ .../AsciidoctorConventionPlugin.java | 294 ++++++++++-------- .../gradle-plugins/gemfire-server.properties | 1 + 14 files changed, 539 insertions(+), 206 deletions(-) create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsEclipsePlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsIdeaPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsMavenPlugin.groovy create mode 100644 buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsPlugin.groovy create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/gemfire-server.properties diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 0579d28b3..5ca840c70 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -12,13 +12,37 @@ group 'io.spring.gradle' sourceCompatibility = 1.8 +sourceSets { + main { + java { + srcDirs = [] + } + groovy { + srcDirs += [ "src/main/java" ] + } + } +} + repositories { - jcenter() - gradlePluginPortal() mavenCentral() + gradlePluginPortal() + jcenter() maven { url 'https://repo.spring.io/plugins-release/' } } +gradlePlugin { + plugins { + managementConfiguration { + id = "io.spring.convention.management-configuration" + implementationClass = "io.spring.gradle.convention.ManagementConfigurationPlugin" + } + propdeps { + id = "org.springframework.propdeps" + implementationClass = "io.spring.gradle.convention.propdeps.PropDepsPlugin" + } + } +} + configurations { implementation { exclude module: 'groovy-all' @@ -29,13 +53,14 @@ dependencies { implementation localGroovy() + runtimeOnly 'org.springframework.boot:spring-boot-loader-tools:2.7.12' + implementation 'com.github.ben-manes:gradle-versions-plugin:0.25.0' implementation 'gradle.plugin.org.gretty:gretty:3.0.1' implementation 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1' - implementation 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE' - implementation 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE' + implementation 'io.spring.gradle:dependency-management-plugin:1.0.15.RELEASE' implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15' - implementation 'io.spring.nohttp:nohttp-gradle:0.0.3.RELEASE' + implementation 'io.spring.nohttp:nohttp-gradle:0.0.11' implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.1.0' implementation 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.1.0' implementation 'org.hidetake:gradle-ssh-plugin:2.10.1' diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy index 3c991dbad..e4636eadb 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy @@ -13,47 +13,52 @@ * License for the specific language governing permissions and limitations under * the License. */ +package io.spring.gradle.convention -package io.spring.gradle.convention; - -import io.spring.gradle.propdeps.PropDepsMavenPlugin; -import org.gradle.api.Plugin; -import org.gradle.api.Project; -import org.gradle.api.plugins.GroovyPlugin; -import org.gradle.api.plugins.JavaPlugin; -import org.gradle.api.plugins.MavenPlugin; -import org.gradle.api.plugins.PluginManager; -import org.gradle.internal.impldep.org.apache.maven.Maven; -import org.gradle.plugins.ide.eclipse.EclipseWtpPlugin; -import org.gradle.plugins.ide.idea.IdeaPlugin; -import io.spring.gradle.propdeps.PropDepsEclipsePlugin; -import io.spring.gradle.propdeps.PropDepsIdeaPlugin; -import io.spring.gradle.propdeps.PropDepsPlugin; +import io.spring.gradle.propdeps.PropDepsEclipsePlugin +import io.spring.gradle.propdeps.PropDepsIdeaPlugin +import io.spring.gradle.propdeps.PropDepsMavenPlugin +import io.spring.gradle.propdeps.PropDepsPlugin +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.GroovyPlugin +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.plugins.MavenPlugin +import org.gradle.api.plugins.PluginManager +import org.gradle.plugins.ide.eclipse.EclipseWtpPlugin +import org.gradle.plugins.ide.idea.IdeaPlugin /** * @author Rob Winch */ -public abstract class AbstractSpringJavaPlugin implements Plugin { +abstract class AbstractSpringJavaPlugin implements Plugin { @Override - public final void apply(Project project) { + final void apply(Project project) { + PluginManager pluginManager = project.getPluginManager(); + pluginManager.apply(JavaPlugin.class); pluginManager.apply(ManagementConfigurationPlugin.class); + if (project.file("src/main/groovy").exists() || project.file("src/test/groovy").exists() || project.file("src/integration-test/groovy").exists()) { pluginManager.apply(GroovyPlugin.class); } + pluginManager.apply("io.spring.convention.repository"); + pluginManager.apply(EclipseWtpPlugin); pluginManager.apply(IdeaPlugin); pluginManager.apply(PropDepsPlugin); pluginManager.apply(PropDepsEclipsePlugin); pluginManager.apply(PropDepsIdeaPlugin); + project.getPlugins().withType(MavenPlugin) { pluginManager.apply(PropDepsMavenPlugin); } + pluginManager.apply("io.spring.convention.tests-configuration"); pluginManager.apply("io.spring.convention.integration-test"); pluginManager.apply("io.spring.convention.springdependencymangement"); @@ -68,21 +73,25 @@ public abstract class AbstractSpringJavaPlugin implements Plugin { project.jar { manifest.attributes["Created-By"] = - "${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})" + "${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})" manifest.attributes["Implementation-Title"] = project.name manifest.attributes["Implementation-Version"] = project.version manifest.attributes["Automatic-Module-Name"] = project.name.replace('-', '.') } + additionalPlugins(project); } private void copyPropertyFromRootProjectTo(String propertyName, Project project) { + Project rootProject = project.getRootProject(); Object property = rootProject.findProperty(propertyName); - if(property != null) { + + if (property != null) { project.setProperty(propertyName, property); } } protected abstract void additionalPlugins(Project project); + } diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy index 0eb1ad42a..23c06af28 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy @@ -1,25 +1,22 @@ package io.spring.gradle.convention import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask -import org.gradle.api.Action import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.Task -import org.gradle.api.artifacts.Configuration -import org.gradle.api.artifacts.DependencySet import org.gradle.api.plugins.PluginManager -import org.gradle.api.tasks.Sync import org.gradle.api.tasks.bundling.Zip /** * Aggregates asciidoc, javadoc, and deploying of the docs into a single plugin */ -public class DocsPlugin implements Plugin { +class DocsPlugin implements Plugin { @Override public void apply(Project project) { PluginManager pluginManager = project.getPluginManager(); + pluginManager.apply("org.asciidoctor.jvm.convert"); pluginManager.apply("org.asciidoctor.jvm.pdf"); pluginManager.apply(AsciidoctorConventionPlugin); @@ -38,7 +35,6 @@ public class DocsPlugin implements Plugin { } } - Task docsZip = project.tasks.create('docsZip', Zip) { dependsOn 'api', 'asciidoctor' group = 'Distribution' @@ -51,15 +47,19 @@ public class DocsPlugin implements Plugin { into 'reference/html5' include '**' } + from(project.tasks.asciidoctorPdf.outputs) { into 'reference/pdf' include '**' rename "index.pdf", pdfFilename } + from(project.tasks.api.outputs) { into 'api' } + into 'docs' + duplicatesStrategy 'exclude' } @@ -68,6 +68,7 @@ public class DocsPlugin implements Plugin { description 'An aggregator task to generate all the documentation' dependsOn docsZip } + project.tasks.assemble.dependsOn docs } } diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringMavenPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringMavenPlugin.groovy index a8d9be270..f6e7fe500 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringMavenPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringMavenPlugin.groovy @@ -2,8 +2,6 @@ package io.spring.gradle.convention import io.spring.gradle.dependencymanagement.DependencyManagementPlugin import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension -import io.spring.gradle.dependencymanagement.dsl.GeneratedPomCustomizationHandler -import org.gradle.api.Action import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.XmlProvider @@ -22,24 +20,32 @@ import org.gradle.plugins.signing.SigningPlugin import org.slf4j.Logger import org.slf4j.LoggerFactory -public class SpringMavenPlugin implements Plugin { +class SpringMavenPlugin implements Plugin { + private static final String ARCHIVES = "archives"; + Logger logger = LoggerFactory.getLogger(getClass()); @Override - public void apply(Project project) { + void apply(Project project) { + project.getPluginManager().apply(JavaPlugin.class); project.getPluginManager().apply(MavenPlugin.class); project.getPluginManager().apply(SigningPlugin.class); Javadoc javadoc = (Javadoc) project.getTasks().findByPath("javadoc"); + Jar javadocJar = project.getTasks().create("javadocJar", Jar.class); + javadocJar.setClassifier("javadoc"); javadocJar.from(javadoc); JavaPluginConvention java = project.getConvention().getPlugin(JavaPluginConvention.class); + SourceSet mainSourceSet = java.getSourceSets().getByName("main"); + Jar sourcesJar = project.getTasks().create("sourcesJar", Jar.class); + sourcesJar.setClassifier("sources"); sourcesJar.from(mainSourceSet.getAllSource()); @@ -51,6 +57,7 @@ public class SpringMavenPlugin implements Plugin { configurePom(project, pom) } } + project.uploadArchives { repositories.mavenDeployer { configurePom(project, pom) @@ -62,6 +69,7 @@ public class SpringMavenPlugin implements Plugin { } def hasSigningKey = project.hasProperty("signing.keyId") || project.findProperty("signingKey") + if(hasSigningKey && Utils.isRelease(project)) { sign(project) } @@ -70,7 +78,9 @@ public class SpringMavenPlugin implements Plugin { } private void inlineDependencyManagement(Project project) { - final DependencyManagementExtension dependencyManagement = project.getExtensions().findByType(DependencyManagementExtension.class); + + DependencyManagementExtension dependencyManagement = project.getExtensions().findByType(DependencyManagementExtension.class); + dependencyManagement.generatedPomCustomization( { handler -> handler.setEnabled(false) }); project.install { @@ -78,6 +88,7 @@ public class SpringMavenPlugin implements Plugin { configurePomForInlineDependencies(project, pom) } } + project.uploadArchives { repositories.mavenDeployer { configurePomForInlineDependencies(project, pom) @@ -86,6 +97,7 @@ public class SpringMavenPlugin implements Plugin { } private void configurePomForInlineDependencies(Project project, MavenPom pom) { + pom.withXml { XmlProvider xml -> project.plugins.withType(JavaBasePlugin) { def dependencies = xml.asNode()?.dependencies?.dependency @@ -118,6 +130,7 @@ public class SpringMavenPlugin implements Plugin { } private void sign(Project project) { + project.install { repositories { mavenDeployer { @@ -136,19 +149,23 @@ public class SpringMavenPlugin implements Plugin { project.signing { required { project.gradle.taskGraph.hasTask("uploadArchives") } + def signingKeyId = project.findProperty("signingKeyId") def signingKey = project.findProperty("signingKey") def signingPassword = project.findProperty("signingPassword") + if (signingKeyId) { useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) } else if (signingKey) { useInMemoryPgpKeys(signingKey, signingPassword) } + sign project.configurations.archives } } private static void configurePom(Project project, MavenPom pom) { + pom.whenConfigured { p -> p.dependencies = p.dependencies.sort { dep -> "$dep.scope:$dep.optional:$dep.groupId:$dep.artifactId" @@ -156,50 +173,52 @@ public class SpringMavenPlugin implements Plugin { } pom.project { + boolean isWar = project.hasProperty("war"); - String projectVersion = String.valueOf(project.getVersion()); + String projectName = Utils.getProjectName(project); + String projectVersion = String.valueOf(project.getVersion()); - if(isWar) { + if (isWar) { packaging = "war" } + name = project.name description = project.name - url = 'https://spring.io/spring-security' - organization { - name = 'spring.io' - url = 'https://spring.io/' - } + url = 'https://spring.io/projects/spring-boot' + licenses { license { name 'The Apache Software License, Version 2.0' url 'https://www.apache.org/licenses/LICENSE-2.0.txt' distribution 'repo' - } } - scm { - url = 'https://github.com/spring-projects/spring-security' - connection = 'scm:git:git://github.com/spring-projects/spring-security' - developerConnection = 'scm:git:git://github.com/spring-projects/spring-security' } + + organization { + name = 'spring.io' + url = 'https://spring.io/' + } + developers { developer { - id = 'rwinch' - name = 'Rob Winch' - email = 'rwinch@pivotal.io' - } - developer { - id = 'jgrandja' - name = 'Joe Grandja' - email = 'jgrandja@pivotal.io' + id = 'jblum' + name = 'John Blum' } } - if(isWar) { + scm { + url = 'https://github.com/spring-projects/spring-boot-data-geode' + connection = 'scm:git:git://github.com/spring-projects/spring-boot-data-geode' + developerConnection = 'scm:git:git://github.com/spring-projects/spring-boot-data-geode' + } + + if (isWar) { properties { 'm2eclipse.wtp.contextRoot' '/' } } + if (Utils.isSnapshot(project)) { repositories { repository { diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy index 5c509e918..a544dc03e 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy @@ -13,7 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ - package io.spring.gradle.convention; import org.gradle.api.Project @@ -28,17 +27,22 @@ class SpringModulePlugin extends AbstractSpringJavaPlugin { @Override void additionalPlugins(Project project) { + PluginManager pluginManager = project.getPluginManager(); + pluginManager.apply(JavaLibraryPlugin.class) pluginManager.apply(MavenPlugin.class); + pluginManager.apply("io.spring.convention.maven"); pluginManager.apply("io.spring.convention.artifactory"); pluginManager.apply("io.spring.convention.jacoco"); pluginManager.apply("io.spring.convention.merge"); def deployArtifacts = project.task("deployArtifacts") + deployArtifacts.group = 'Deploy tasks' deployArtifacts.description = "Deploys the artifacts to either Artifactory or Maven Central" + if (Utils.isRelease(project)) { deployArtifacts.dependsOn project.tasks.uploadArchives } @@ -46,5 +50,4 @@ class SpringModulePlugin extends AbstractSpringJavaPlugin { deployArtifacts.dependsOn project.tasks.artifactoryPublish } } - } diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy index 2d7ee845e..d80aef077 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy @@ -13,22 +13,19 @@ * License for the specific language governing permissions and limitations under * the License. */ +package io.spring.gradle.convention -package io.spring.gradle.convention; - -import org.gradle.api.Project; -import org.gradle.api.plugins.PluginManager; -import org.gradle.api.plugins.WarPlugin -import org.gradle.api.plugins.JavaPlugin; -import org.gradle.api.tasks.testing.Test +import org.gradle.api.Project +import org.gradle.api.plugins.PluginManager /** * @author Rob Winch */ -public class SpringSampleBootPlugin extends SpringSamplePlugin { +class SpringSampleBootPlugin extends SpringSamplePlugin { @Override - public void additionalPlugins(Project project) { + void additionalPlugins(Project project) { + super.additionalPlugins(project); PluginManager pluginManager = project.getPluginManager(); diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy index 37ae6cfb3..3a065c7ab 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy @@ -13,7 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ - package io.spring.gradle.convention; import org.gradle.api.Project @@ -22,10 +21,11 @@ import org.sonarqube.gradle.SonarQubePlugin; /** * @author Rob Winch */ -public class SpringSamplePlugin extends AbstractSpringJavaPlugin { +class SpringSamplePlugin extends AbstractSpringJavaPlugin { @Override - public void additionalPlugins(Project project) { + void additionalPlugins(Project project) { + project.plugins.withType(SonarQubePlugin) { project.sonarqube.skipProject = true } diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy index 59bb1545c..72185b99d 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy @@ -13,7 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ - package io.spring.gradle.convention import org.gradle.api.Project @@ -24,10 +23,11 @@ import org.gradle.api.tasks.testing.Test /** * @author Rob Winch */ -public class SpringSampleWarPlugin extends SpringSamplePlugin { +class SpringSampleWarPlugin extends SpringSamplePlugin { @Override - public void additionalPlugins(Project project) { + void additionalPlugins(Project project) { + super.additionalPlugins(project); PluginManager pluginManager = project.getPluginManager(); @@ -51,6 +51,7 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin { } } } + project.tasks.withType(org.akhikhl.gretty.AppBeforeIntegrationTestTask).all { task -> task.dependsOn prepareAppServerForIntegrationTests } @@ -63,6 +64,7 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin { } def applyForIntegrationTest(Project project, Task integrationTest) { + project.gretty.integrationTestTask = integrationTest.name integrationTest.doFirst { @@ -89,9 +91,9 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin { } def getRandomPort() { - ServerSocket ss = new ServerSocket(0) - int port = ss.localPort - ss.close() + ServerSocket serverSocket = new ServerSocket(0) + int port = serverSocket.localPort + serverSocket.close() return port } } diff --git a/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsEclipsePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsEclipsePlugin.groovy new file mode 100644 index 000000000..1fb8a3fe9 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsEclipsePlugin.groovy @@ -0,0 +1,45 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package io.spring.gradle.propdeps + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.plugins.ide.eclipse.EclipsePlugin + +/** + * Gradle {@link Plugin} to allow {@literal optional} and {@literal provided} dependency configurations + * to work with the standard Gradle {@link EclipsePlugin}. + * + * @author Phillip Webb + * @author John Blum + * @see org.gradle.api.Plugin + * @see org.gradle.api.Project + * @see org.gradle.plugins.ide.eclipse.EclipsePlugin + */ +class PropDepsEclipsePlugin implements Plugin { + + void apply(Project project) { + + project.plugins.apply(PropDepsPlugin) + project.plugins.apply(EclipsePlugin) + + project.eclipse { + classpath { + plusConfigurations += [ project.configurations.provided, project.configurations.optional ] + } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsIdeaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsIdeaPlugin.groovy new file mode 100644 index 000000000..2435b1f85 --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsIdeaPlugin.groovy @@ -0,0 +1,48 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package io.spring.gradle.propdeps + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.plugins.ide.idea.IdeaPlugin + +/** + * Gradle {@link Plugin} to allow {@literal optional} and {@literal provided} dependency configurations + * to work with the standard Gradle {@link IdeaPlugin}. + * + * @author Phillip Webb + * @author Brian Clozel + * @author John Blum + * @see org.gradle.api.Plugin + * @see org.gradle.api.Project + * @see org.gradle.plugins.ide.idea.IdeaPlugin + * @link https://youtrack.jetbrains.com/issue/IDEA-107046 + * @link https://youtrack.jetbrains.com/issue/IDEA-117668 + */ +class PropDepsIdeaPlugin implements Plugin { + + void apply(Project project) { + + project.plugins.apply(PropDepsPlugin) + project.plugins.apply(IdeaPlugin) + project.idea.module { + // IntelliJ IDEA internally deals with 4 scopes : COMPILE, TEST, PROVIDED, RUNTIME + // but only PROVIDED seems to be picked up + scopes.PROVIDED.plus += [ project.configurations.provided ] + scopes.PROVIDED.plus += [ project.configurations.optional ] + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsMavenPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsMavenPlugin.groovy new file mode 100644 index 000000000..067e5212d --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsMavenPlugin.groovy @@ -0,0 +1,67 @@ +/* + * Copyright 2002-2012 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.spring.gradle.propdeps + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer +import org.gradle.api.artifacts.maven.MavenPom +import org.gradle.api.artifacts.maven.PomFilterContainer +import org.gradle.api.plugins.MavenPlugin +import org.gradle.api.tasks.Upload + +/** + * Plugin to allow optional and provided dependency configurations to work with + * the standard gradle 'maven' plugin + * + * @author Phillip Webb + * @author John Blum + */ +class PropDepsMavenPlugin implements Plugin { + + void apply(Project project) { + + project.plugins.apply(PropDepsPlugin) + project.plugins.apply(MavenPlugin) + + Conf2ScopeMappingContainer scopeMappings = project.conf2ScopeMappings + + scopeMappings.addMapping(MavenPlugin.COMPILE_PRIORITY + 1, + project.configurations.getByName("provided"), Conf2ScopeMappingContainer.PROVIDED) + + // Add a temporary new optional scope + scopeMappings.addMapping(MavenPlugin.COMPILE_PRIORITY + 2, + project.configurations.getByName("optional"), "optional") + + // Add a hook to replace the optional scope + project.afterEvaluate { + project.tasks.withType(Upload).each { applyToUploadTask(project, it) } + } + } + + private void applyToUploadTask(Project project, Upload upload) { + upload.repositories.withType(PomFilterContainer).each{ applyToPom(project, it) } + } + + private void applyToPom(Project project, PomFilterContainer pomContainer) { + pomContainer.pom.whenConfigured { MavenPom pom -> + pom.dependencies.findAll{ it.scope == "optional" }.each { + it.scope = "compile" + it.optional = true + } + } + } +} diff --git a/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsPlugin.groovy new file mode 100644 index 000000000..781e4e69c --- /dev/null +++ b/buildSrc/src/main/groovy/io/spring/gradle/propdeps/PropDepsPlugin.groovy @@ -0,0 +1,82 @@ +/* + * Copyright 2017-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package io.spring.gradle.propdeps + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.artifacts.Configuration +import org.gradle.api.plugins.JavaLibraryPlugin +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.tasks.javadoc.Javadoc + +/** + * Gradle {@link Plugin} to allow {@literal optional} and {@literal provided} dependency configurations. + * + * As stated in the Maven documentation, {@literal provided} scope {@literal "is only available on the compilation + * and test classpath, and is not transitive"}. + * + * This {@link Plugin} creates two new configurations, and each one: + * + *
        + *
      • is a parent of the compile configuration
        • + *
      • is not visible, not transitive
        • + *
      • all dependencies are excluded from the default configuration
        • + *
      + * + * @author Phillip Webb + * @author Brian Clozel + * @author Rob Winch + * @author John Blum + * + * @see org.gradle.api.Plugin + * @see org.gradle.api.Project + * @see PropDepsEclipsePlugin + * @see PropDepsIdeaPlugin + * @see Maven documentation + * @see Gradle configurations + */ +class PropDepsPlugin implements Plugin { + + void apply(Project project) { + + project.plugins.apply(JavaPlugin) + + Configuration optional = addConfiguration(project, "optional") + Configuration provided = addConfiguration(project, "provided") + + Javadoc javadoc = project.tasks.getByName(JavaPlugin.JAVADOC_TASK_NAME) + + javadoc.classpath = javadoc.classpath + provided + optional + } + + private Configuration addConfiguration(Project project, String name) { + + Configuration configuration = project.configurations.create(name) + + configuration.extendsFrom(project.configurations.implementation) + + project.plugins.withType(JavaLibraryPlugin, { + configuration.extendsFrom(project.configurations.api) + }) + + project.sourceSets.all { + compileClasspath += configuration + runtimeClasspath += configuration + } + + return configuration + } +} diff --git a/buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java b/buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java index 548dfbca5..f8c54117b 100644 --- a/buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java +++ b/buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java @@ -1,208 +1,242 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2017-present 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. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing + * permissions and limitations under the License. */ - package io.spring.gradle.convention; -import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider; +import java.io.File; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; + import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask; import org.asciidoctor.gradle.jvm.AsciidoctorJExtension; import org.asciidoctor.gradle.jvm.AsciidoctorJPlugin; import org.asciidoctor.gradle.jvm.AsciidoctorTask; -import org.gradle.api.Action; +import org.gradle.api.JavaVersion; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; -import org.gradle.api.artifacts.DependencySet; -import org.gradle.api.artifacts.dsl.RepositoryHandler; -import org.gradle.api.file.CopySpec; +import org.gradle.api.file.DuplicatesStrategy; import org.gradle.api.file.FileTree; import org.gradle.api.tasks.Sync; -import java.io.File; -import java.net.URI; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.function.Consumer; - /** - * Conventions that are applied in the presence of the {@link AsciidoctorJPlugin}. When - * the plugin is applied: + * Conventions that are applied in the presence of the {@link AsciidoctorJPlugin}. + *

      + * When the plugin is applied: * *

        *
      • All warnings are made fatal. - *
      • A task is created to resolve and unzip our documentation resources (CSS and - * Javascript). + *
      • A task is created to resolve and unzip our documentation resources (CSS and Javascript). *
      • For each {@link AsciidoctorTask} (HTML only): *
          *
        • A configuration named asciidoctorExtensions is ued to add the - * block - * switch extension + * block switch extension *
        • {@code doctype} {@link AsciidoctorTask#options(Map) option} is configured. - *
        • {@link AsciidoctorTask#attributes(Map) Attributes} are configured for syntax - * highlighting, CSS styling, docinfo, etc. + *
        • {@link AsciidoctorTask#attributes(Map) Attributes} are configured for syntax highlighting, CSS styling, + * docinfo, etc. *
        *
      • For each {@link AbstractAsciidoctorTask} (HTML and PDF): *
          - *
        • {@link AsciidoctorTask#attributes(Map) Attributes} are configured to enable - * warnings for references to missing attributes, the year is added as @{code today-year}, - * etc - *
        • {@link AbstractAsciidoctorTask#baseDirFollowsSourceDir() baseDirFollowsSourceDir()} - * is enabled. + *
        • {@link AsciidoctorTask#attributes(Map) Attributes} are configured to enable warnings for references to + * missing attributes, the year is added as @{code today-year}, etc + *
        • {@link AbstractAsciidoctorTask#baseDirFollowsSourceDir() baseDirFollowsSourceDir()} is enabled. *
        *
      * * @author Andy Wilkinson * @author Rob Winch + * @author John Blum */ public class AsciidoctorConventionPlugin implements Plugin { + private static final String ASCIIDOCTORJ_VERSION = "2.4.3"; + private static final String SPRING_ASCIIDOCTOR_BACKENDS_VERSION = "0.0.5"; + private static final String SPRING_DOC_RESOURCES_VERSION = "0.2.5"; + + private static final String SPRING_ASCIIDOCTOR_BACKENDS_DEPENDENCY = + String.format("io.spring.asciidoctor.backends:spring-asciidoctor-backends:%s", + SPRING_ASCIIDOCTOR_BACKENDS_VERSION); + + @SuppressWarnings("unused") + private static final String SPRING_DOC_RESOURCES_DEPENDENCY = + String.format("io.spring.docresources:spring-doc-resources:%s", SPRING_DOC_RESOURCES_VERSION); + + @Override public void apply(Project project) { - project.getPlugins().withType(AsciidoctorJPlugin.class, (asciidoctorPlugin) -> { - createDefaultAsciidoctorRepository(project); + + project.getPlugins().withType(AsciidoctorJPlugin.class, asciidoctorPlugin -> { + + setAsciidoctorJVersion(project); makeAllWarningsFatal(project); + createAsciidoctorExtensionsConfiguration(project); + Sync unzipResources = createUnzipDocumentationResourcesTask(project); - project.getTasks().withType(AbstractAsciidoctorTask.class, (asciidoctorTask) -> { + + project.getTasks().withType(AbstractAsciidoctorTask.class, asciidoctorTask -> { + asciidoctorTask.dependsOn(unzipResources); - configureExtensions(project, asciidoctorTask); - configureCommonAttributes(project, asciidoctorTask); - configureOptions(asciidoctorTask); - asciidoctorTask.baseDirFollowsSourceDir(); - asciidoctorTask.useIntermediateWorkDir(); - asciidoctorTask.resources(new Action() { - @Override - public void execute(CopySpec resourcesSpec) { - resourcesSpec.from(unzipResources); - resourcesSpec.from(asciidoctorTask.getSourceDir(), new Action() { - @Override - public void execute(CopySpec resourcesSrcDirSpec) { - // https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/523 - // For now copy the entire sourceDir over so that include files are - // available in the intermediateWorkDir - // resourcesSrcDirSpec.include("images/**"); - } - }); - } + configureAsciidoctorTask(project, asciidoctorTask); + + asciidoctorTask.resources(resourcesSpec -> { + resourcesSpec.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE); + resourcesSpec.from(unzipResources); + resourcesSpec.from(asciidoctorTask.getSourceDir(), resourcesSrcDirSpec -> { + // https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/523 + // For now copy the entire sourceDir over so that include files are + // available in the intermediateWorkDir + // resourcesSrcDirSpec.include("images/**"); + }); }); - if (asciidoctorTask instanceof AsciidoctorTask) { - configureHtmlOnlyAttributes(project, asciidoctorTask); - } }); }); } - private void createDefaultAsciidoctorRepository(Project project) { - project.getGradle().afterProject(new Action() { - @Override - public void execute(Project project) { - RepositoryHandler repositories = project.getRepositories(); - if (repositories.isEmpty()) { - repositories.mavenCentral(); - repositories.maven(repo -> { - repo.setUrl(URI.create("https://repo.spring.io/release")); - }); - } - } - }); + private void setAsciidoctorJVersion(Project project) { + project.getExtensions().getByType(AsciidoctorJExtension.class).setVersion(ASCIIDOCTORJ_VERSION); } private void makeAllWarningsFatal(Project project) { project.getExtensions().getByType(AsciidoctorJExtension.class).fatalWarnings(".*"); } - private void configureExtensions(Project project, AbstractAsciidoctorTask asciidoctorTask) { - Configuration extensionsConfiguration = project.getConfigurations().maybeCreate("asciidoctorExtensions"); - extensionsConfiguration.defaultDependencies(new Action() { - @Override - public void execute(DependencySet dependencies) { - dependencies.add(project.getDependencies().create("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.4.2.RELEASE")); - } + private void createAsciidoctorExtensionsConfiguration(Project project) { + + project.getConfigurations().create("asciidoctorExtensions", configuration -> { + + project.getConfigurations() + .matching(it -> "dependencyManagement".equals(it.getName())) + .all(configuration::extendsFrom); + + configuration.getDependencies() + .add(project.getDependencies().create(SPRING_ASCIIDOCTOR_BACKENDS_DEPENDENCY)); + + // TODO: Why is the asiidoctorj-pdf dependency needed? + configuration.getDependencies() + .add(project.getDependencies().create("org.asciidoctor:asciidoctorj-pdf:1.5.3")); }); - asciidoctorTask.configurations(extensionsConfiguration); } + /** + * Requests the base Spring Documentation Resources from {@literal Maven Central} and uses it to format + * and render documentation. + * + * @param project {@literal this} Gradle {@link Project}. + * @return a {@link Sync} task that copies Spring Documentation Resources to the build directory + * used to generate documentation. + * @see org.gradle.api.tasks.Sync + * @see org.gradle.api.Project + */ + @SuppressWarnings("all") private Sync createUnzipDocumentationResourcesTask(Project project) { - Configuration documentationResources = project.getConfigurations().maybeCreate("documentationResources"); + + Configuration documentationResources = project.getConfigurations().create("documentationResources"); + documentationResources.getDependencies() - .add(project.getDependencies().create("io.spring.docresources:spring-doc-resources:0.2.5")); - Sync unzipResources = project.getTasks().create("unzipDocumentationResources", - Sync.class, new Action() { - @Override - public void execute(Sync sync) { - sync.dependsOn(documentationResources); - sync.from(new Callable>() { - @Override - public List call() throws Exception { - List result = new ArrayList<>(); - documentationResources.getAsFileTree().forEach(new Consumer() { - @Override - public void accept(File file) { - result.add(project.zipTree(file)); - } - }); - return result; - } - }); - File destination = new File(project.getBuildDir(), "docs/resources"); - sync.into(project.relativePath(destination)); - } + .add(project.getDependencies().create(SPRING_ASCIIDOCTOR_BACKENDS_DEPENDENCY)); + + Sync unzipResources = project.getTasks().create("unzipDocumentationResources", Sync.class, sync -> { + + sync.dependsOn(documentationResources); + + Callable> source = () -> { + List result = new ArrayList<>(); + documentationResources.getAsFileTree().forEach(file -> result.add(project.zipTree(file))); + return result; + }; + + sync.from(source); + + File destination = new File(project.getBuildDir(), "docs/resources"); + + sync.into(project.relativePath(destination)); + }); + return unzipResources; } - private void configureOptions(AbstractAsciidoctorTask asciidoctorTask) { - asciidoctorTask.options(Collections.singletonMap("doctype", "book")); - } + private void configureAsciidoctorTask(Project project, AbstractAsciidoctorTask asciidoctorTask) { - private void configureHtmlOnlyAttributes(Project project, AbstractAsciidoctorTask asciidoctorTask) { - Map attributes = new HashMap<>(); - attributes.put("source-highlighter", "highlight.js"); - attributes.put("highlightjsdir", "js/highlight"); - attributes.put("highlightjs-theme", "github"); - attributes.put("linkcss", true); - attributes.put("icons", "font"); - attributes.put("stylesheet", "css/spring.css"); - asciidoctorTask.getAttributeProviders().add(new AsciidoctorAttributeProvider() { - @Override - public Map getAttributes() { - Object version = project.getVersion(); - Map attrs = new HashMap<>(); - if (version != null && version.toString() != Project.DEFAULT_VERSION) { - attrs.put("revnumber", version); - } - return attrs; - } - }); - asciidoctorTask.attributes(attributes); + asciidoctorTask.baseDirFollowsSourceDir(); + asciidoctorTask.configurations("asciidoctorExtensions"); + //asciidoctorTask.useIntermediateWorkDir(); + + configureAttributes(project, asciidoctorTask); + configureForkOptions(asciidoctorTask); + configureOptions(asciidoctorTask); + + if (asciidoctorTask instanceof AsciidoctorTask) { + boolean pdf = asciidoctorTask.getName().toLowerCase().contains("pdf"); + String backend = pdf ? "spring-pdf" : "spring-html"; + ((AsciidoctorTask) asciidoctorTask).outputOptions((outputOptions) -> outputOptions.backends(backend)); + configureHtmlOnlyAttributes(asciidoctorTask); + } } - private void configureCommonAttributes(Project project, AbstractAsciidoctorTask asciidoctorTask) { + private void configureAttributes(Project project, AbstractAsciidoctorTask asciidoctorTask) { + Map attributes = new HashMap<>(); + attributes.put("attribute-missing", "warn"); - attributes.put("icons", "font"); + attributes.put("docinfo", "shared"); attributes.put("idprefix", ""); attributes.put("idseparator", "-"); - attributes.put("docinfo", "shared"); attributes.put("sectanchors", ""); attributes.put("sectnums", ""); attributes.put("today-year", LocalDate.now().getYear()); + + Object version = project.getVersion(); + + if (version != null && !Project.DEFAULT_VERSION.equals(version)) { + attributes.put("revnumber", version); + } + asciidoctorTask.attributes(attributes); } + + private void configureForkOptions(AbstractAsciidoctorTask asciidoctorTask) { + if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) { + asciidoctorTask.forkOptions(options -> options.jvmArgs( + "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", + "--add-opens", "java.base/java.io=ALL-UNNAMED") + ); + } + } + + private void configureHtmlOnlyAttributes(AbstractAsciidoctorTask asciidoctorTask) { + + Map attributes = new HashMap<>(); + + attributes.put("highlightjsdir", "js/highlight"); + attributes.put("highlightjs-theme", "github"); + attributes.put("source-highlighter", "highlight.js"); + attributes.put("icons", "font"); + attributes.put("imagesdir", "./images"); + attributes.put("linkcss", true); + attributes.put("stylesdir", "css/"); + //attributes.put("stylesheet", "spring.css"); + + asciidoctorTask.attributes(attributes); + } + + private void configureOptions(AbstractAsciidoctorTask asciidoctorTask) { + asciidoctorTask.options(Collections.singletonMap("doctype", "book")); + } } diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/gemfire-server.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/gemfire-server.properties new file mode 100644 index 000000000..bb6a3057c --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/gemfire-server.properties @@ -0,0 +1 @@ +implementation-class=build.GemFireServerPlugin \ No newline at end of file From 39f5594f11d445d94fe1d4d6865432a7619a953d Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 2 Jun 2023 14:56:24 -0700 Subject: [PATCH 186/201] Switch to local Spring Build Conventions Gradle Plugins. --- build.gradle | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index dc2facd26..77e41faca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,11 @@ import io.spring.gradle.convention.Utils buildscript { + ext { + snapshotBuild = Utils.isSnapshot(project) + milestoneBuild = Utils.isMilestone(project) + releaseBuild = Utils.isRelease(project) + } repositories { mavenCentral() gradlePluginPortal() @@ -16,9 +21,6 @@ buildscript { } } dependencies { - classpath('io.spring.gradle:spring-build-conventions:0.0.38') { - exclude group: "io.spring.gradle", module: "docbook-reference-plugin" - } classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } } @@ -57,8 +59,4 @@ description = 'Spring Boot for Apache Geode' //ext['spring-data-bom.version'] = "$springDataBomVersion" //ext['spring-session-bom.version'] = "$springSessionBomVersion" -ext.snapshotBuild = Utils.isSnapshot(project) -ext.milestoneBuild = Utils.isMilestone(project) -ext.releaseBuild = Utils.isRelease(project) - ext.MAVEN_POM_EDITOR_GRADLE = "$rootDir/gradle/maven-pom-editor.gradle" From d9d0504a0e743f76d483271ffa203b11e27c1100 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 13 Jun 2023 17:26:06 -0700 Subject: [PATCH 187/201] Upgrade to com.github.ben-manes.versions Gradle Plugin 0.47.0. --- Jenkinsfile | 1 - buildSrc/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e825a8af2..fcb4d7594 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,6 @@ pipeline { // Cleanup any prior build system resources try { - sh "echo 'Clean up GemFire/Geode files & build artifacts...'" sh "ci/cleanupArtifacts.sh" sh "ci/cleanupGemFiles.sh" } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 5ca840c70..8e2535ce4 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -1,7 +1,7 @@ plugins { id "java-gradle-plugin" id "com.jfrog.artifactory" version '4.9.10' - id 'com.github.ben-manes.versions' version '0.25.0' + id 'com.github.ben-manes.versions' version '0.47.0' } apply plugin: 'java' @@ -55,7 +55,7 @@ dependencies { runtimeOnly 'org.springframework.boot:spring-boot-loader-tools:2.7.12' - implementation 'com.github.ben-manes:gradle-versions-plugin:0.25.0' + implementation 'com.github.ben-manes:gradle-versions-plugin:0.47.0' implementation 'gradle.plugin.org.gretty:gretty:3.0.1' implementation 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1' implementation 'io.spring.gradle:dependency-management-plugin:1.0.15.RELEASE' From 67c669b83625841504f42f2fe54f9ec34e8b4b38 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 13 Jun 2023 17:27:52 -0700 Subject: [PATCH 188/201] Upgrade to Spring Boot 2.7.13-SNAPSHOT. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 319952b6b..17a4de28f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.5 pivotalGemFireVersion=9.10.17 springVersion=5.3.27 -springBootVersion=2.7.12-SNAPSHOT +springBootVersion=2.7.13-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.11 springDataGeodeVersion=2.7.6 From a844602c32e593093224cdabe32d8940d2188c0c Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 13 Jun 2023 17:31:06 -0700 Subject: [PATCH 189/201] Upgrade to Spring Data BOM 2021.2.12. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 17a4de28f..007c75a8a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.17 springVersion=5.3.27 springBootVersion=2.7.13-SNAPSHOT springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.11 +springDataBomVersion=2021.2.12 springDataGeodeVersion=2.7.6 springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.1 From 43d865a97bb3ab2e0a43bb1e319a28123372d09e Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 13 Jun 2023 17:31:33 -0700 Subject: [PATCH 190/201] Upgrade to Spring Data for Apache Geode 2.7.12. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 007c75a8a..58f6a0ebe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.27 springBootVersion=2.7.13-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.12 -springDataGeodeVersion=2.7.6 +springDataGeodeVersion=2.7.12 springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.1 springSessionDataGeodeVersion=2.7.1 From 5c86df457127836d7ae137f868dc486b59e5485f Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 13 Jun 2023 17:33:28 -0700 Subject: [PATCH 191/201] Ugrade to Testcontainers 1.18.3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 58f6a0ebe..182deb69b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.1 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE -testcontainersVersion=1.18.1 +testcontainersVersion=1.18.3 version=1.7.6-SNAPSHOT From 4ace73f5e0f015e769274a1d049b35f24fe8f39c Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 7 Sep 2023 10:59:54 -0700 Subject: [PATCH 192/201] Edit Jenkins CI pipeline properties and upgrade to JDK 8u382. --- ci/pipeline.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.properties b/ci/pipeline.properties index fbd84ba1d..c150a13a6 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,5 +1,5 @@ # Java (JDK) versions -java.main.tag=8u362-b09-jdk-focal +java.main.tag=8u382-b05-jdk-focal # Docker Container Images docker.container.image.java.main=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag} From e5a64e9f06b321ed92e3c447b90020f083192cd1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 24 Oct 2023 10:18:50 -0700 Subject: [PATCH 193/201] Fix broken references to AdoptOpenJDK 8 in Jenkinsfile. --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fcb4d7594..ad66e76aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,7 +70,7 @@ pipeline { } steps { script { - docker.image('adoptopenjdk/openjdk8:latest').inside("--name ${env.HOSTNAME}Two -u root -v /tmp:/tmp") { + docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) { withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { withCredentials([usernamePassword(credentialsId: p['artifactory.credentials'], usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { try { @@ -93,7 +93,7 @@ pipeline { } steps { script { - docker.image('adoptopenjdk/openjdk8:latest').inside("--name ${env.HOSTNAME}One -u root -v /tmp:/tmp") { + docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) { withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) { withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) { withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) { From 514b692da0aa96b3ba7f33f36b5ab00932b7dfc4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 31 Oct 2023 14:40:02 -0700 Subject: [PATCH 194/201] Upgrade to VMware GemFire for TAS (Pivotal Cloud Cache) 1.14.9. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 182deb69b..f3343927d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ apacheGeodeVersion=1.14.4 awaitilityVersion=4.2.0 findbugsVersion=3.0.2 multithreadedtcVersion=1.01 -pivotalCloudCacheVersion=1.14.5 +pivotalCloudCacheVersion=1.14.9 pivotalGemFireVersion=9.10.17 springVersion=5.3.27 springBootVersion=2.7.13-SNAPSHOT From b496b586903882897d8ad3dffccc69eb4fcd02c7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 31 Oct 2023 14:41:10 -0700 Subject: [PATCH 195/201] Upgrade to Spring Framework 5.3.30. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f3343927d..76dcfb2c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ findbugsVersion=3.0.2 multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.9 pivotalGemFireVersion=9.10.17 -springVersion=5.3.27 +springVersion=5.3.30 springBootVersion=2.7.13-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.12 From 53e8ac06a274badd91c3ff49be388f25efae8325 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 31 Oct 2023 14:41:53 -0700 Subject: [PATCH 196/201] Set Spring Boot version to 2.7.18-SNAPSHOT. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 76dcfb2c0..a3332d393 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.9 pivotalGemFireVersion=9.10.17 springVersion=5.3.30 -springBootVersion=2.7.13-SNAPSHOT +springBootVersion=2.7.18-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.12 springDataGeodeVersion=2.7.12 From f5e571c9a1743ac35be7ee3ddee5454a227ada37 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 31 Oct 2023 14:43:20 -0700 Subject: [PATCH 197/201] Upgrade to Spring Data BOM 2021.2.17. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a3332d393..5cfa59e6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ pivotalGemFireVersion=9.10.17 springVersion=5.3.30 springBootVersion=2.7.18-SNAPSHOT springCloudBindingsVersion=1.8.1 -springDataBomVersion=2021.2.12 +springDataBomVersion=2021.2.17 springDataGeodeVersion=2.7.12 springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.1 From f17ef56c64c4cebbe3edf038faf07bed45537f44 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 31 Oct 2023 14:43:51 -0700 Subject: [PATCH 198/201] Upgrade to Spring Data for Apache Geode 2.7.17. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5cfa59e6f..996d4c6ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ springVersion=5.3.30 springBootVersion=2.7.18-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.17 -springDataGeodeVersion=2.7.12 +springDataGeodeVersion=2.7.17 springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.1 springSessionDataGeodeVersion=2.7.1 From 5ba474fc6377dedf2a835c02ba73020e997ae502 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 31 Oct 2023 14:45:03 -0700 Subject: [PATCH 199/201] Upgrade to Spring Session 2021.2.3. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 996d4c6ca..52053560a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.17 springDataGeodeVersion=2.7.17 springDataGeodeTestVersion=0.3.4-RAJ -springSessionBomVersion=2021.2.1 +springSessionBomVersion=2021.2.3 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE testcontainersVersion=1.18.3 From ff9f47763105c5b4fec023845574277b34cf33b5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 31 Oct 2023 14:45:58 -0700 Subject: [PATCH 200/201] Upgrade to Testcontainers 1.19.1. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 52053560a..ab1ecffd0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ springDataGeodeTestVersion=0.3.4-RAJ springSessionBomVersion=2021.2.3 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE -testcontainersVersion=1.18.3 +testcontainersVersion=1.19.1 version=1.7.6-SNAPSHOT From 3fcd42f602e6a323dc6263a151a934f024e53409 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 31 Oct 2023 16:52:10 -0700 Subject: [PATCH 201/201] Upgrade to Spring Test for Apache Geode 0.3.6-RAJ. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ab1ecffd0..6700bc5a1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ springBootVersion=2.7.18-SNAPSHOT springCloudBindingsVersion=1.8.1 springDataBomVersion=2021.2.17 springDataGeodeVersion=2.7.17 -springDataGeodeTestVersion=0.3.4-RAJ +springDataGeodeTestVersion=0.3.6-RAJ springSessionBomVersion=2021.2.3 springSessionDataGeodeVersion=2.7.1 springShellVersion=1.2.0.RELEASE