From 8a1fc544d260b1c8e4258ddcddf883fd26fc30dc Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 19 Jan 2022 13:48:07 -0500 Subject: [PATCH 01/11] Migrates from circleci to github actions --- .circleci/config.yml | 42 ------------------------------------- .github/workflows/maven.yml | 37 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 42 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/maven.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index cb0201d4..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,42 +0,0 @@ -version: 2 -jobs: - build: - docker: - - image: springcloud/pipeline-base -# user: appuser - environment: - _JAVA_OPTIONS: "-Xms1024m -Xmx2048m" - TERM: dumb - branches: - ignore: - - gh-pages # list of branches to ignore - steps: - - checkout - - restore_cache: - key: sc-zookeeper-{{ .Branch }} - - run: - command: apt-get -y install redis-server - - run: - name: "Download dependencies" - command: | - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true - - save_cache: - key: sc-zookeeper-{{ .Branch }} - paths: - - ~/.m2 - - run: - name: "Running build" - command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - run: - name: "Aggregate test results" - when: always - command: | - mkdir -p ~/junit/ - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \; - bash <(curl -s https://codecov.io/bash) - - store_artifacts: - path: ~/junit/ - destination: artifacts - - store_test_results: - path: ~/junit/ - destination: testartifacts \ No newline at end of file diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 00000000..98bf13c3 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,37 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Build + +on: + push: + branches: [ main, 3.1.x ] + pull_request: + branches: [ main, 3.1.x ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: '17' + - name: Cache local Maven repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Build with Maven + run: ./mvnw clean install -B -U -Pspring -Dmaven.test.redirectTestOutputToFile=true + - name: Publish Test Report + uses: mikepenz/action-junit-report@v2 + if: always() # always run even if the previous step fails + with: + report_paths: '**/surefire-reports/TEST-*.xml' \ No newline at end of file From 5e86df71f654bf4e86ab87c891805083c4651778 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 19 Jan 2022 13:49:33 -0500 Subject: [PATCH 02/11] Migrates from circleci to github actions --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 98bf13c3..df87b825 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: '17' + java-version: '8' - name: Cache local Maven repository uses: actions/cache@v2 with: From 150eff1907790319959d13b4f541013d1ff4b24a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 17:34:15 +0000 Subject: [PATCH 03/11] Update SNAPSHOT to 3.1.1 --- README.adoc | 2 +- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.adoc b/README.adoc index 2d78d9b6..ba34bba3 100644 --- a/README.adoc +++ b/README.adoc @@ -315,7 +315,7 @@ Doing so brings in the required Spring Cloud Maven repositories and Build. == Building -:jdkversion: 1.8 +:jdkversion: 17 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index b39c7dd3..c4f17655 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 spring-cloud-zookeeper-docs jar diff --git a/pom.xml b/pom.xml index a46c052c..800ecff2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 3.1.1 @@ -138,10 +138,10 @@ - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index d24ede45..9bd8c724 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 11bffdf2..43f78240 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 1e9f4780..82085fd2 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index d1e589d5..e4dececc 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 86468942..3047cae1 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index d070e63f..c442ef3c 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 57430837..6d97c73f 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.0 + 3.1.1 spring-cloud-zookeeper-dependencies - 3.1.1-SNAPSHOT + 3.1.1 pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index f58cc683..b7951a5c 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 25b85020..1eb7f9fb 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.1 .. From 8b07262ef3fc5c8c5fa34cec0e5d8a9ec34dc75b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 17:38:07 +0000 Subject: [PATCH 04/11] Going back to snapshots --- README.adoc | 2 +- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.adoc b/README.adoc index ba34bba3..2d78d9b6 100644 --- a/README.adoc +++ b/README.adoc @@ -315,7 +315,7 @@ Doing so brings in the required Spring Cloud Maven repositories and Build. == Building -:jdkversion: 17 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index c4f17655..b39c7dd3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT spring-cloud-zookeeper-docs jar diff --git a/pom.xml b/pom.xml index 800ecff2..a46c052c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.1-SNAPSHOT @@ -138,10 +138,10 @@ - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 9bd8c724..d24ede45 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 43f78240..11bffdf2 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 82085fd2..1e9f4780 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index e4dececc..d1e589d5 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 3047cae1..86468942 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index c442ef3c..d070e63f 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 6d97c73f..57430837 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.1 + 3.1.0 spring-cloud-zookeeper-dependencies - 3.1.1 + 3.1.1-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index b7951a5c..f58cc683 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 1eb7f9fb..25b85020 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1 + 3.1.1-SNAPSHOT .. From 90b679f2b4a100f2dc1767a7f6e15898a35a7dc8 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 17:38:07 +0000 Subject: [PATCH 05/11] Bumping versions to 3.1.2-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index b39c7dd3..8a414e1c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-zookeeper-docs jar diff --git a/pom.xml b/pom.xml index a46c052c..dbe632ec 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 3.1.1 @@ -138,10 +138,10 @@ - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT + 3.1.1 + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index d24ede45..41178551 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 11bffdf2..473d860f 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 1e9f4780..280e7626 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index d1e589d5..df02c377 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 86468942..65e7580c 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index d070e63f..21a713f2 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 57430837..8c20b5d7 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.0 + 3.1.2-SNAPSHOT spring-cloud-zookeeper-dependencies - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index f58cc683..de23b30a 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 25b85020..5c4f7e1a 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. From 30c2a923c663bee1d5a6f06efdb38e85df2dc1af Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 24 Feb 2022 14:58:14 +0000 Subject: [PATCH 06/11] Bumping versions --- README.adoc | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 2d78d9b6..ba34bba3 100644 --- a/README.adoc +++ b/README.adoc @@ -315,7 +315,7 @@ Doing so brings in the required Spring Cloud Maven repositories and Build. == Building -:jdkversion: 1.8 +:jdkversion: 17 === Basic Compile and Test diff --git a/pom.xml b/pom.xml index dbe632ec..efd8942d 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.2-SNAPSHOT @@ -138,7 +138,7 @@ - 3.1.1 + 3.1.2-SNAPSHOT 3.1.2-SNAPSHOT 3.1.2-SNAPSHOT 3.1.2-SNAPSHOT From 3c01356abbef07df9de53b03228271c6d107b19c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 20 Apr 2022 13:09:29 +0200 Subject: [PATCH 07/11] Update runAcceptanceTests.sh --- scripts/runAcceptanceTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index ec1aa71e..ee0dbc70 100755 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -2,7 +2,7 @@ set -o errexit -SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/master/runAcceptanceTests.sh" +SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/2021.0.x/runAcceptanceTests.sh" AT_WHAT_TO_TEST="ZOOKEEPER" curl "${SCRIPT_URL}" --output runAcceptanceTests.sh From eef43f23ab545a1184f1b2bf28a8a50776712ea0 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 26 May 2022 12:10:30 -0400 Subject: [PATCH 08/11] don't upload docs to maven central --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index 8a414e1c..a6f395ec 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -18,6 +18,8 @@ spring.cloud.zookeeper.*| deploy + + none From e227fe1cb5901882546160f3700b1473766ea665 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 26 May 2022 21:13:50 +0000 Subject: [PATCH 09/11] Update SNAPSHOT to 3.1.2 --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index a6f395ec..ab25e409 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-zookeeper-docs jar diff --git a/pom.xml b/pom.xml index efd8942d..296765f9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.3 @@ -138,10 +138,10 @@ - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.3 + 3.1.3 + 3.1.3 + 3.1.3 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 41178551..468ccaa0 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 473d860f..36b4d815 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 280e7626..6fd5ee4e 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index df02c377..155e4e10 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 65e7580c..be30903c 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index 21a713f2..a8b5d240 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 8c20b5d7..14dad152 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.3 spring-cloud-zookeeper-dependencies - 3.1.2-SNAPSHOT + 3.1.2 pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index de23b30a..46563765 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 5c4f7e1a..f496c53f 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2-SNAPSHOT + 3.1.2 .. From 298be5a817ada24fd5dbff37b9c4c1a16af35742 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 27 May 2022 14:15:12 -0400 Subject: [PATCH 10/11] Updates to latest snapshot version --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ab25e409..7a15d72c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT spring-cloud-zookeeper-docs jar diff --git a/pom.xml b/pom.xml index 296765f9..81d36589 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.3 + 3.1.4-SNAPSHOT @@ -138,10 +138,10 @@ - 3.1.3 - 3.1.3 - 3.1.3 - 3.1.3 + 3.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.4-SNAPSHOT diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 468ccaa0..71a47412 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 36b4d815..92610605 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 6fd5ee4e..b6b70a65 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 155e4e10..b3df1fa1 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index be30903c..40cb7cde 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index a8b5d240..bf6be7d9 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 14dad152..d70a010f 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-zookeeper-dependencies - 3.1.2 + 3.1.3-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index 46563765..51986779 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index f496c53f..627eddae 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 3.1.2 + 3.1.3-SNAPSHOT .. From d96947720c8b0a0e71b2f4018047d60c738ee790 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 3 Jun 2022 16:10:05 -0400 Subject: [PATCH 11/11] Config server function should return empty list when discovery client disabled (#298) --- ...onditionalOnZookeeperDiscoveryEnabled.java | 7 ++- .../ZookeeperConfigServerBootstrapper.java | 9 +++- ...eeperServiceRegistryAutoConfiguration.java | 2 + ...ookeeperConfigServerBootstrapperTests.java | 50 +++++++++++++++++-- 4 files changed, 60 insertions(+), 8 deletions(-) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnZookeeperDiscoveryEnabled.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnZookeeperDiscoveryEnabled.java index d87a51be..0466c678 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnZookeeperDiscoveryEnabled.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnZookeeperDiscoveryEnabled.java @@ -33,7 +33,10 @@ import org.springframework.cloud.zookeeper.ConditionalOnZookeeperEnabled; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) @ConditionalOnZookeeperEnabled -@ConditionalOnProperty(value = "spring.cloud.zookeeper.discovery.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = ConditionalOnZookeeperDiscoveryEnabled.PROPERTY, matchIfMissing = true) public @interface ConditionalOnZookeeperDiscoveryEnabled { - + /** + * Property name. + */ + String PROPERTY = "spring.cloud.zookeeper.discovery.enabled"; } diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java index 83a11868..5a67f7fc 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java @@ -16,6 +16,8 @@ package org.springframework.cloud.zookeeper.discovery.configclient; +import java.util.Collections; + import org.apache.curator.framework.CuratorFramework; import org.apache.curator.x.discovery.ServiceDiscovery; import org.apache.curator.x.discovery.ServiceDiscoveryBuilder; @@ -32,6 +34,7 @@ import org.springframework.cloud.commons.util.InetUtilsProperties; import org.springframework.cloud.config.client.ConfigClientProperties; import org.springframework.cloud.config.client.ConfigServerInstanceProvider; import org.springframework.cloud.zookeeper.CuratorFactory; +import org.springframework.cloud.zookeeper.discovery.ConditionalOnZookeeperDiscoveryEnabled; import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryClient; import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties; import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance; @@ -102,7 +105,7 @@ public class ZookeeperConfigServerBootstrapper implements BootstrapRegistryIniti // create instance provider registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, context -> { if (!isEnabled(context.get(Binder.class))) { - return null; + return (id) -> Collections.emptyList(); } return context.get(ZookeeperDiscoveryClient.class)::getInstances; }); @@ -122,7 +125,9 @@ public class ZookeeperConfigServerBootstrapper implements BootstrapRegistryIniti } private boolean isEnabled(Binder binder) { - return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false); + return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false) && + binder.bind(ConditionalOnZookeeperDiscoveryEnabled.PROPERTY, Boolean.class).orElse(true) && + binder.bind("spring.cloud.discovery.enabled", Boolean.class).orElse(true); } } diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java index eeecb9e4..d07216ca 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.curator.x.discovery.details.JsonInstanceSerializer; import org.springframework.beans.BeansException; import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.client.serviceregistry.ServiceRegistryAutoConfiguration; @@ -52,6 +53,7 @@ public class ZookeeperServiceRegistryAutoConfiguration } @Bean + @ConditionalOnBean(ServiceDiscovery.class) @SuppressWarnings("unchecked") public ZookeeperServiceRegistry zookeeperServiceRegistry() { return new ZookeeperServiceRegistry(this.context.getBean(ServiceDiscovery.class)); diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperTests.java index d02cc161..a66ca956 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperTests.java @@ -52,15 +52,15 @@ public class ZookeeperConfigServerBootstrapperTests { } @Test - public void notEnabledDoesNotAddInstanceProviderFn() { + public void notEnabledReturnsEmptyList() { ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class) .listeners(new ZookeeperTestingServer()) .properties("--server.port=0", "spring.cloud.service-registry.auto-registration.enabled=false") .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); - assertThat(providerFn).as("ConfigServerInstanceProvider.Function was created when it shouldn't") - .isNull(); + assertThat(providerFn.apply("id")).as("ConfigServerInstanceProvider.Function should return empty list") + .isEmpty(); })).run(); CuratorFramework curatorFramework = context.getBean("curatorFramework", CuratorFramework.class); assertThat(curatorFramework).isNotNull(); @@ -69,6 +69,48 @@ public class ZookeeperConfigServerBootstrapperTests { context.close(); } + @Test + public void zookeeperDiscoveryClientDisabledReturnsEmptyList() { + ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class) + .listeners(new ZookeeperTestingServer()) + .properties("--server.port=0", "spring.cloud.config.discovery.enabled=true", + "spring.cloud.zookeeper.discovery.enabled=false", + "spring.cloud.zookeeper.discovery.metadata[mymetadataprop]=mymetadataval", + "spring.cloud.service-registry.auto-registration.enabled=false") + .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { + ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() + .get(ConfigServerInstanceProvider.Function.class); + assertThat(providerFn.apply("id")).as("ConfigServerInstanceProvider.Function should return empty list") + .isEmpty(); + })).run(); + CuratorFramework curatorFramework = context.getBean("curatorFramework", CuratorFramework.class); + assertThat(curatorFramework).isNotNull(); + assertThatThrownBy(() -> + context.getBean("configDataCuratorFramework", CuratorFramework.class)).isInstanceOf(NoSuchBeanDefinitionException.class); + context.close(); + } + + @Test + public void discoveryClientDisabledReturnsEmptyList() { + ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class) + .listeners(new ZookeeperTestingServer()) + .properties("--server.port=0", "spring.cloud.config.discovery.enabled=true", + "spring.cloud.discovery.enabled=false", + "spring.cloud.zookeeper.discovery.metadata[mymetadataprop]=mymetadataval", + "spring.cloud.service-registry.auto-registration.enabled=false") + .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { + ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() + .get(ConfigServerInstanceProvider.Function.class); + assertThat(providerFn.apply("id")).as("ConfigServerInstanceProvider.Function should return empty list") + .isEmpty(); + })).run(); + CuratorFramework curatorFramework = context.getBean("curatorFramework", CuratorFramework.class); + assertThat(curatorFramework).isNotNull(); + assertThatThrownBy(() -> + context.getBean("configDataCuratorFramework", CuratorFramework.class)).isInstanceOf(NoSuchBeanDefinitionException.class); + context.close(); + } + @Test public void enabledAddsInstanceProviderFn() { AtomicReference bootstrapDiscoveryClient = new AtomicReference<>(); @@ -82,7 +124,7 @@ public class ZookeeperConfigServerBootstrapperTests { .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); - assertThat(providerFn).as("ConfigServerInstanceProvider.Function was not created when it should.") + assertThat(providerFn.apply("id")).as("Should return empty list.") .isNotNull(); bootstrapDiscoveryClient.set(event.getBootstrapContext().get(ZookeeperDiscoveryClient.class)); })).run();