From 3cfa13c9678c3c0321fc9a5c4b1a4be9c63dbc8a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 15 Jun 2022 11:40:22 +0000 Subject: [PATCH] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- .../AbstractAutoServiceRegistration.java | 3 ++- .../RegistrationManagementLifecycle.java | 2 +- ...egistrationRegistrationLifecycleTests.java | 20 +++++++++---------- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-bootstrap/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 15 files changed, 27 insertions(+), 26 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index fe7dd6fa..92e2a5cf 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT jar Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 8c5fa416..831f5a12 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.0.0-M3 + 4.0.0-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index ffbd155a..3f51055a 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.0.0-M3 + 4.0.0-SNAPSHOT spring-cloud-commons-dependencies - 4.0.0-M3 + 4.0.0-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index fd2b36a7..9c92ac82 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java index 99d451bc..75ff107f 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java @@ -102,7 +102,8 @@ public abstract class AbstractAutoServiceRegistration this.registrationLifecycles = registrationLifecycles; } - public void addRegistrationManagementLifecycle(RegistrationManagementLifecycle registrationManagementLifecycle) { + public void addRegistrationManagementLifecycle( + RegistrationManagementLifecycle registrationManagementLifecycle) { this.registrationManagementLifecycles.add(registrationManagementLifecycle); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/RegistrationManagementLifecycle.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/RegistrationManagementLifecycle.java index aa378d70..a41a57ed 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/RegistrationManagementLifecycle.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/RegistrationManagementLifecycle.java @@ -18,7 +18,7 @@ package org.springframework.cloud.client.serviceregistry; /** * Service registration life cycle. This life cycle is only related to - * {@link org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration#getManagementRegistration()}. + * {@link org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration#getManagementRegistration()}. * * @author Zen Huifer */ diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationRegistrationLifecycleTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationRegistrationLifecycleTests.java index b0e2c187..ed8f9826 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationRegistrationLifecycleTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationRegistrationLifecycleTests.java @@ -91,7 +91,7 @@ class AbstractAutoServiceRegistrationRegistrationLifecycleTests { @EnableAutoConfiguration @Configuration(proxyBeanMethods = false) - static class Config { + static class Config { @Bean public TestAutoServiceRegistrationLifecycle testAutoServiceRegistration( @@ -162,17 +162,17 @@ class AbstractAutoServiceRegistrationRegistrationLifecycleTests { } - static class TestRegistrationLifecycleServiceRegistration - implements ServiceRegistry { + static class TestRegistrationLifecycleServiceRegistration + implements ServiceRegistry { - private boolean registered = false; + private boolean registered = false; - private boolean deregistered = false; + private boolean deregistered = false; - @Override - public void register(TestRegistrationLifecycleRegistration registration) { - if (registration == null) { - throw new NullPointerException(); + @Override public void register( + TestRegistrationLifecycleRegistration registration) { + if (registration == null) { + throw new NullPointerException(); } if (!(registration instanceof TestRegistrationLifecycleRegistration)) { this.registered = true; @@ -214,7 +214,7 @@ class AbstractAutoServiceRegistrationRegistrationLifecycleTests { } - static class TestRegistrationLifecycleRegistration implements Registration { + static class TestRegistrationLifecycleRegistration implements Registration { private final Map metadata = new HashMap<>(8); diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 4d06a134..841fa5c7 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index c00958b0..1d71b7b2 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 33d27203..072578b1 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 375d9ca6..0a302e5d 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index c8ca8620..28b92dd8 100644 --- a/spring-cloud-starter-bootstrap/pom.xml +++ b/spring-cloud-starter-bootstrap/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index 6c3a2c0a..e9c0f60f 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index deda856e..9d194f92 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index b157b50e..be60faa7 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.0.0-M3 + 4.0.0-SNAPSHOT .. spring-cloud-test-support