From 4528239fafd15a10073125832ea2ba713cb84c11 Mon Sep 17 00:00:00 2001 From: Yi Liu Date: Fri, 24 Dec 2021 15:15:31 +0800 Subject: [PATCH 01/20] add java doc (#26173) --- .../config/AzureBootstrapConfiguration.java | 8 ++++++ ...reListenerAnnotationBeanPostProcessor.java | 4 +++ .../AzureListenerEndpointRegistrar.java | 27 ++++++++++++++++++ .../config/AzureMessagingConfiguration.java | 5 ++++ .../DefaultAzureListenerContainerFactory.java | 4 +++ .../AbstractAzureListenerEndpoint.java | 28 +++++++++++++++++++ .../endpoint/MethodAzureListenerEndpoint.java | 22 +++++++++++++++ .../endpoint/SimpleAzureListenerEndpoint.java | 8 ++++++ .../listener/DefaultAzureMessageHandler.java | 4 +++ .../test/AzurePartitionBinderTests.java | 3 ++ 10 files changed, 113 insertions(+) diff --git a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureBootstrapConfiguration.java b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureBootstrapConfiguration.java index 7445494ed9a40..1f5e4dbd20f6c 100644 --- a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureBootstrapConfiguration.java +++ b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureBootstrapConfiguration.java @@ -27,12 +27,20 @@ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public class AzureBootstrapConfiguration { + /** + * Bean for the {@link AzureListenerAnnotationBeanPostProcessor}. + * @return the bean post processor bean. + */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Bean public AzureListenerAnnotationBeanPostProcessor azureListenerAnnotationProcessor() { return new AzureListenerAnnotationBeanPostProcessor(); } + /** + * Bean for the {@link AzureListenerEndpointRegistry}. + * @return the listener endpoint registry bean. + */ @Bean(name = AzureListenerAnnotationBeanPostProcessor.DEFAULT_AZURE_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME) public AzureListenerEndpointRegistry azureListenerEndpointRegistry() { return new AzureListenerEndpointRegistry(); diff --git a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureListenerAnnotationBeanPostProcessor.java b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureListenerAnnotationBeanPostProcessor.java index 2e00d7ac1dfbc..e0e27380f0524 100644 --- a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureListenerAnnotationBeanPostProcessor.java +++ b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureListenerAnnotationBeanPostProcessor.java @@ -91,6 +91,10 @@ public class AzureListenerAnnotationBeanPostProcessor @Nullable private StringValueResolver embeddedValueResolver; + /** + * Set the container factory bean name. + * @param containerFactoryBeanName the container factory bean name. + */ public void setContainerFactoryBeanName(String containerFactoryBeanName) { this.containerFactoryBeanName = containerFactoryBeanName; } diff --git a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureListenerEndpointRegistrar.java b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureListenerEndpointRegistrar.java index e336af2fb8d74..d29e1cc8c2b65 100644 --- a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureListenerEndpointRegistrar.java +++ b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureListenerEndpointRegistrar.java @@ -53,6 +53,9 @@ public void afterPropertiesSet() { registerAllEndpoints(); } + /** + * Register all {@link AzureListenerEndpoint}s under the registrar to create the associated containers. + */ protected void registerAllEndpoints() { Assert.state(this.endpointRegistry != null, "No AzureListenerEndpointRegistry set"); synchronized (this.mutex) { @@ -120,26 +123,50 @@ public void registerEndpoint(AzureListenerEndpoint endpoint) { registerEndpoint(endpoint, null); } + /** + * Set the bean name of the container factory. + * @param containerFactoryBeanName the bean name of the container factory. + */ public void setContainerFactoryBeanName(String containerFactoryBeanName) { this.containerFactoryBeanName = containerFactoryBeanName; } + /** + * Get the {@link AzureListenerEndpointRegistry}. + * @return the {@link AzureListenerEndpointRegistry}. + */ public AzureListenerEndpointRegistry getEndpointRegistry() { return this.endpointRegistry; } + /** + * Set the {@link AzureListenerEndpointRegistry}. + * @param endpointRegistry the {@link AzureListenerEndpointRegistry}. + */ public void setEndpointRegistry(AzureListenerEndpointRegistry endpointRegistry) { this.endpointRegistry = endpointRegistry; } + /** + * Get the {@link MessageHandlerMethodFactory}. + * @return the {@link MessageHandlerMethodFactory}. + */ public MessageHandlerMethodFactory getMessageHandlerMethodFactory() { return this.messageHandlerMethodFactory; } + /** + * Set the {@link MessageHandlerMethodFactory}. + * @param messageHandlerMethodFactory the {@link MessageHandlerMethodFactory}. + */ public void setMessageHandlerMethodFactory(MessageHandlerMethodFactory messageHandlerMethodFactory) { this.messageHandlerMethodFactory = messageHandlerMethodFactory; } + /** + * Set the {@link ListenerContainerFactory}. + * @param containerFactory the {@link ListenerContainerFactory}. + */ public void setContainerFactory(ListenerContainerFactory containerFactory) { this.containerFactory = containerFactory; } diff --git a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureMessagingConfiguration.java b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureMessagingConfiguration.java index f5f22c2d79253..d75d1c9d2eaca 100644 --- a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureMessagingConfiguration.java +++ b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/config/AzureMessagingConfiguration.java @@ -17,6 +17,11 @@ @Configuration public class AzureMessagingConfiguration { + /** + * Bean for the {@link ListenerContainerFactory}. + * @param subscribeByGroupOperation the {@link SubscribeByGroupOperation}. + * @return the {@link ListenerContainerFactory} bean. + */ @ConditionalOnMissingBean @Bean(name = AzureListenerAnnotationBeanPostProcessor.DEFAULT_AZURE_LISTENER_CONTAINER_FACTORY_BEAN_NAME) public ListenerContainerFactory azureListenerContainerFactory( diff --git a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/container/DefaultAzureListenerContainerFactory.java b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/container/DefaultAzureListenerContainerFactory.java index 173f163755089..e1b18edfd8b1c 100644 --- a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/container/DefaultAzureListenerContainerFactory.java +++ b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/container/DefaultAzureListenerContainerFactory.java @@ -14,6 +14,10 @@ public class DefaultAzureListenerContainerFactory extends AbstractAzureListenerContainerFactory { + /** + * Construct the listener container factory with the {@link SubscribeByGroupOperation}. + * @param subscribeOperation the {@link SubscribeByGroupOperation}. + */ public DefaultAzureListenerContainerFactory(SubscribeByGroupOperation subscribeOperation) { super(subscribeOperation); } diff --git a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/AbstractAzureListenerEndpoint.java b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/AbstractAzureListenerEndpoint.java index c708e7210c429..4daa76f895c5b 100644 --- a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/AbstractAzureListenerEndpoint.java +++ b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/AbstractAzureListenerEndpoint.java @@ -63,18 +63,34 @@ public String toString() { return getEndpointDescription().toString(); } + /** + * Get the destination. + * @return the destination. + */ public String getDestination() { return destination; } + /** + * Set the destination. + * @param destination the destination. + */ public void setDestination(String destination) { this.destination = destination; } + /** + * Get the group for the corresponding listener container. + * @return the group for the corresponding listener container. + */ public String getGroup() { return group; } + /** + * Set the group for the corresponding listener container. + * @param group the group for the corresponding listener container. + */ public void setGroup(String group) { this.group = group; } @@ -84,14 +100,26 @@ public String getId() { return id; } + /** + * Set the id of this endpoint. + * @param id the id of this endpoint. + */ public void setId(String id) { this.id = id; } + /** + * Set the concurrency expression. + * @param concurrency the concurrency expression. + */ public void setConcurrency(String concurrency) { this.concurrency = concurrency; } + /** + * Get the concurrency expression. + * @return the concurrency expression. + */ public String getConcurrency() { return concurrency; } diff --git a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/MethodAzureListenerEndpoint.java b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/MethodAzureListenerEndpoint.java index 39c277169b5bf..8881eda2d5c35 100644 --- a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/MethodAzureListenerEndpoint.java +++ b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/MethodAzureListenerEndpoint.java @@ -66,22 +66,44 @@ protected StringBuilder getEndpointDescription() { .append(this.method).append("'"); } + /** + * Get the object instance that should manage this endpoint. + * @return the target bean instance. + */ public Object getBean() { return bean; } + /** + * Set the object instance that should manage this endpoint. + * @param bean the target bean instance. + */ public void setBean(Object bean) { this.bean = bean; } + /** + * Get the method to invoke to process a message managed by this endpoint. + * @return the method to invoke to process a message managed by this endpoint. + */ public Method getMethod() { return method; } + /** + * Set the method to invoke to process a message managed by this endpoint. + * @param method the target method for the {@link #bean}. + */ public void setMethod(Method method) { this.method = method; } + /** + * Set the {@link MessageHandlerMethodFactory} to use to build the + * {@link InvocableHandlerMethod} responsible to manage the invocation + * of this endpoint. + * @param messageHandlerMethodFactory the {@link MessageHandlerMethodFactory} instance. + */ public void setMessageHandlerMethodFactory(MessageHandlerMethodFactory messageHandlerMethodFactory) { this.messageHandlerMethodFactory = messageHandlerMethodFactory; } diff --git a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/SimpleAzureListenerEndpoint.java b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/SimpleAzureListenerEndpoint.java index c1c18a40a0d6f..d58fb71cfe89f 100644 --- a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/SimpleAzureListenerEndpoint.java +++ b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/endpoint/SimpleAzureListenerEndpoint.java @@ -23,10 +23,18 @@ protected AzureMessageHandler createMessageHandler(MessageListenerContainer cont return this.azureMessageHandler; } + /** + * Get the message handler. + * @return the message handler. + */ public AzureMessageHandler getAzureMessageHandler() { return azureMessageHandler; } + /** + * Set the message handler. + * @param azureMessageHandler the message handler. + */ public void setAzureMessageHandler(AzureMessageHandler azureMessageHandler) { this.azureMessageHandler = azureMessageHandler; } diff --git a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/listener/DefaultAzureMessageHandler.java b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/listener/DefaultAzureMessageHandler.java index 4e304263f45f1..e61dbe8182c90 100644 --- a/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/listener/DefaultAzureMessageHandler.java +++ b/sdk/spring/azure-spring-cloud-messaging/src/main/java/com/azure/spring/messaging/listener/DefaultAzureMessageHandler.java @@ -53,6 +53,10 @@ private Class resolveMessagePayloadType(InvocableHandlerMethod method) { return parameterTypes[0]; } + /** + * Get the handler method. + * @return the handler method. + */ public InvocableHandlerMethod getHandlerMethod() { return handlerMethod; } diff --git a/sdk/spring/azure-spring-cloud-stream-binder-test/src/main/java/com/azure/spring/servicebus/stream/binder/test/AzurePartitionBinderTests.java b/sdk/spring/azure-spring-cloud-stream-binder-test/src/main/java/com/azure/spring/servicebus/stream/binder/test/AzurePartitionBinderTests.java index 97a0e34c75d10..b13cb508604ad 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-test/src/main/java/com/azure/spring/servicebus/stream/binder/test/AzurePartitionBinderTests.java +++ b/sdk/spring/azure-spring-cloud-stream-binder-test/src/main/java/com/azure/spring/servicebus/stream/binder/test/AzurePartitionBinderTests.java @@ -39,6 +39,9 @@ public abstract class AzurePartitionBinderTests extends PartitionCapableBinderTests { + /** + * Execute necessary operations to enable tests. + */ @BeforeAll public static void enableTests() { } From ad6cacbfb1e1cf547a63510d45cf435c476ae74e Mon Sep 17 00:00:00 2001 From: Yi Liu Date: Fri, 24 Dec 2021 16:04:16 +0800 Subject: [PATCH 02/20] Udpate spring appconfig libraries for Dec release (#26165) --- eng/versioning/version_client.txt | 10 +++++----- .../CHANGELOG.md | 11 ++--------- .../pom.xml | 4 ++-- .../CHANGELOG.md | 9 ++------- .../pom.xml | 2 +- .../CHANGELOG.md | 11 ++--------- .../azure-spring-cloud-feature-management-web/pom.xml | 6 +++--- .../CHANGELOG.md | 11 ++--------- .../azure-spring-cloud-feature-management/pom.xml | 2 +- .../CHANGELOG.md | 11 ++--------- .../pom.xml | 6 +++--- .../pom.xml | 2 +- 12 files changed, 26 insertions(+), 59 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index f2e94174595de..f68f9535886c2 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -145,11 +145,11 @@ com.microsoft.azure:spring-cloud-azure-appconfiguration-config;1.3.0;1.4.0-beta. com.microsoft.azure:spring-cloud-azure-feature-management-web;1.3.0;1.4.0-beta.1 com.microsoft.azure:spring-cloud-azure-feature-management;1.3.0;1.4.0-beta.1 com.microsoft.azure:spring-cloud-starter-azure-appconfiguration-config;1.3.0;1.4.0-beta.1 -com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.2.0;2.3.0-beta.1 -com.azure.spring:azure-spring-cloud-appconfiguration-config;2.2.0;2.3.0-beta.1 -com.azure.spring:azure-spring-cloud-feature-management-web;2.1.0;2.2.0-beta.1 -com.azure.spring:azure-spring-cloud-feature-management;2.1.0;2.2.0-beta.1 -com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.2.0;2.3.0-beta.1 +com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.2.0;2.3.0 +com.azure.spring:azure-spring-cloud-appconfiguration-config;2.2.0;2.3.0 +com.azure.spring:azure-spring-cloud-feature-management-web;2.1.0;2.2.0 +com.azure.spring:azure-spring-cloud-feature-management;2.1.0;2.2.0 +com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.2.0;2.3.0 com.azure.spring:azure-identity-spring;1.11.0;1.12.0 com.azure.spring:azure-spring-boot-bom;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.11.0;3.12.0 diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md index 3c1a141ff816e..3ce6b2a633166 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md @@ -1,14 +1,7 @@ # Release History -## 2.3.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes +## 2.3.0 (2021-12-24) +This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ## 2.2.0 (2021-11-25) diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml index 05985d2e39f7f..1b453beee2805 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-appconfiguration-config-web - 2.3.0-beta.1 + 2.3.0 Azure Spring Cloud App Configuration Config Web Integration of Spring Cloud Config and Azure App Configuration Service @@ -26,7 +26,7 @@ com.azure.spring azure-spring-cloud-appconfiguration-config - 2.3.0-beta.1 + 2.3.0 org.springframework.boot diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md index 8a63d98a903a3..104bcf6f8fac3 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md @@ -1,17 +1,12 @@ # Release History -## 2.3.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes +## 2.3.0 (2021-12-24) +This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ### Bugs Fixed * Fixed a bug where `spring.cloud.application` was still used in some locations. This caused a refresh bug where a `null` value was used on refresh. `spring.cloud.application` is replaced by `key-filter`. -### Other Changes - ## 2.2.0 (2021-11-25) * Fixed a bug where JsonNode type was passed to Spring instead of a String, when the JsonNode was a number Spring had issues resolving the value. diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml index 6f5537a23dff5..4195d4fbbaef1 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-appconfiguration-config - 2.3.0-beta.1 + 2.3.0 Azure Spring Cloud App Configuration Config Integration of Spring Cloud Config and Azure App Configuration Service diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md index 69c3c0d0c8186..a8d5f084651cc 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md @@ -1,14 +1,7 @@ # Release History -## 2.2.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes +## 2.2.0 (2021-12-24) +This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ## 2.1.0 (2021-11-25) diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml index 281337edd20a5..464235ebde7ad 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml @@ -11,7 +11,7 @@ com.azure.spring azure-spring-cloud-feature-management-web - 2.2.0-beta.1 + 2.2.0 Azure Spring Cloud Feature Management Web Adds Feature Management into Spring Web @@ -47,7 +47,7 @@ com.azure.spring azure-spring-cloud-feature-management - 2.2.0-beta.1 + 2.2.0 + com.azure.spring:azure-spring-cloud-feature-management:[2.2.0] javax.servlet:javax.servlet-api:[4.0.1] org.springframework:spring-web:[5.3.13] org.springframework:spring-webmvc:[5.3.13] diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md index a053f746908d5..f6db15e61a202 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md @@ -1,14 +1,7 @@ # Release History -## 2.2.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes +## 2.2.0 (2021-12-24) +This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ## 2.1.0 (2021-11-25) diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml index d11e6e78e3e73..e90d687943aeb 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml @@ -11,7 +11,7 @@ com.azure.spring azure-spring-cloud-feature-management - 2.2.0-beta.1 + 2.2.0 Azure Spring Cloud Feature Management Adds Feature Management into Spring diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md index bdb4972936cb5..a942e23594b25 100644 --- a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md @@ -1,14 +1,7 @@ # Release History -## 2.3.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes +## 2.3.0 (2021-12-24) +This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ## 2.2.0 (2021-11-25) diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml index 5c42fff93853c..19d2eb9f3550f 100644 --- a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml @@ -11,19 +11,19 @@ com.azure.spring azure-spring-cloud-starter-appconfiguration-config - 2.3.0-beta.1 + 2.3.0 Azure Spring Cloud Starter App Configuration Config com.azure.spring azure-spring-cloud-appconfiguration-config-web - 2.3.0-beta.1 + 2.3.0 com.azure.spring azure-spring-cloud-feature-management-web - 2.2.0-beta.1 + 2.2.0 diff --git a/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml index 45e19ee770f9c..6aeb27eaeb917 100644 --- a/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml @@ -24,7 +24,7 @@ com.azure.spring azure-spring-cloud-starter-appconfiguration-config - 2.3.0-beta.1 + 2.3.0 com.azure.spring From e36f12b1e9d80048b420b9e6373eade317c41a09 Mon Sep 17 00:00:00 2001 From: Yi Liu Date: Fri, 24 Dec 2021 16:49:37 +0800 Subject: [PATCH 03/20] remove empty headers (#26178) --- sdk/spring/azure-spring-cloud-context/CHANGELOG.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sdk/spring/azure-spring-cloud-context/CHANGELOG.md b/sdk/spring/azure-spring-cloud-context/CHANGELOG.md index e93158194db49..a7d1756ebc1a5 100644 --- a/sdk/spring/azure-spring-cloud-context/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-context/CHANGELOG.md @@ -3,14 +3,6 @@ ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - ### Dependency Upgrades - Upgrade to [spring-boot-dependencies:2.6.1](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.1/spring-boot-dependencies-2.6.1.pom). - Upgrade to [spring-cloud-dependencies:2021.0.0](https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2021.0.0/spring-cloud-dependencies-2021.0.0.pom). From aa968b56b1e75eee79e45a30344173676ec7c9bd Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 24 Dec 2021 01:26:00 -0800 Subject: [PATCH 04/20] Increment version for spring releases (#26179) Increment package version after release of com.azure.spring azure-spring-cloud-context --- eng/jacoco-test-coverage/pom.xml | 4 ++-- eng/versioning/version_client.txt | 4 ++-- .../pom.xml | 2 +- .../azure-spring-boot-starter-active-directory/pom.xml | 2 +- sdk/spring/azure-spring-boot-starter-cosmos/pom.xml | 2 +- .../azure-spring-boot-starter-keyvault-secrets/pom.xml | 2 +- .../azure-spring-boot-starter-servicebus-jms/pom.xml | 2 +- sdk/spring/azure-spring-boot-starter-storage/pom.xml | 2 +- sdk/spring/azure-spring-boot-starter/pom.xml | 2 +- sdk/spring/azure-spring-boot/CHANGELOG.md | 10 ++++++++++ sdk/spring/azure-spring-boot/pom.xml | 2 +- sdk/spring/azure-spring-cloud-autoconfigure/pom.xml | 2 +- sdk/spring/azure-spring-cloud-context/CHANGELOG.md | 10 ++++++++++ sdk/spring/azure-spring-cloud-context/pom.xml | 2 +- sdk/spring/azure-spring-cloud-messaging/pom.xml | 2 +- sdk/spring/azure-spring-cloud-starter-cache/pom.xml | 2 +- .../azure-spring-cloud-starter-eventhubs-kafka/pom.xml | 2 +- .../azure-spring-cloud-starter-storage-queue/pom.xml | 2 +- sdk/spring/azure-spring-cloud-storage/pom.xml | 2 +- sdk/spring/azure-spring-integration-core/pom.xml | 2 +- sdk/spring/pom.xml | 4 ++-- 21 files changed, 42 insertions(+), 22 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 92a63d562cfa9..967db59e270cc 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -429,7 +429,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 com.azure.spring @@ -479,7 +479,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 com.azure.spring diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index f68f9535886c2..338e070f0a4a4 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -160,9 +160,9 @@ com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-storage;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter;3.11.0;3.12.0 -com.azure.spring:azure-spring-boot;3.11.0;3.12.0 +com.azure.spring:azure-spring-boot;3.12.0;3.13.0-beta.1 com.azure.spring:azure-spring-cloud-autoconfigure;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-context;2.11.0;2.12.0 +com.azure.spring:azure-spring-cloud-context;2.12.0;2.13.0-beta.1 com.azure.spring:azure-spring-cloud-dependencies;2.11.0;2.12.0 com.azure.spring:azure-spring-cloud-messaging;2.11.0;2.12.0 com.azure.spring:azure-spring-cloud-starter-cache;2.11.0;2.12.0 diff --git a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml index 28be17b4e6d70..1a4bdb52bca2c 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml @@ -34,7 +34,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml index 5a5ad1e4145ec..8d21ac3514832 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml @@ -38,7 +38,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 org.springframework diff --git a/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml b/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml index 9b41957d1fe02..ae518bdfd80c4 100644 --- a/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml @@ -33,7 +33,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 com.azure diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml index 6ae992ce3fd4e..1f40950c76e8e 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml @@ -33,7 +33,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 com.azure diff --git a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml index 7b02f3d41b9ba..f14d7e52ddf7c 100644 --- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml @@ -23,7 +23,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-starter-storage/pom.xml b/sdk/spring/azure-spring-boot-starter-storage/pom.xml index 7982d61acabb4..0ca232fbe92e3 100644 --- a/sdk/spring/azure-spring-boot-starter-storage/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-storage/pom.xml @@ -23,7 +23,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-starter/pom.xml b/sdk/spring/azure-spring-boot-starter/pom.xml index 34f0b60070196..7f0919f495194 100644 --- a/sdk/spring/azure-spring-boot-starter/pom.xml +++ b/sdk/spring/azure-spring-boot-starter/pom.xml @@ -33,7 +33,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot/CHANGELOG.md b/sdk/spring/azure-spring-boot/CHANGELOG.md index 6fd78a5e5ac5c..d7028256e7a6b 100644 --- a/sdk/spring/azure-spring-boot/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 3.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml index 4e8f29ba30f50..b576bafc49b0c 100644 --- a/sdk/spring/azure-spring-boot/pom.xml +++ b/sdk/spring/azure-spring-boot/pom.xml @@ -13,7 +13,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 jar Azure Spring Boot AutoConfigure diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml index b3f478ffc6d9e..eed542956c0f1 100644 --- a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml +++ b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml @@ -124,7 +124,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 true diff --git a/sdk/spring/azure-spring-cloud-context/CHANGELOG.md b/sdk/spring/azure-spring-cloud-context/CHANGELOG.md index a7d1756ebc1a5..985504b56b973 100644 --- a/sdk/spring/azure-spring-cloud-context/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-context/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-context/pom.xml b/sdk/spring/azure-spring-cloud-context/pom.xml index addb39d429630..f2a7654957869 100644 --- a/sdk/spring/azure-spring-cloud-context/pom.xml +++ b/sdk/spring/azure-spring-cloud-context/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Context https://github.com/Azure/azure-sdk-for-java diff --git a/sdk/spring/azure-spring-cloud-messaging/pom.xml b/sdk/spring/azure-spring-cloud-messaging/pom.xml index 66fe9aee12f08..597dc425fd766 100644 --- a/sdk/spring/azure-spring-cloud-messaging/pom.xml +++ b/sdk/spring/azure-spring-cloud-messaging/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 org.springframework diff --git a/sdk/spring/azure-spring-cloud-starter-cache/pom.xml b/sdk/spring/azure-spring-cloud-starter-cache/pom.xml index 4629960c5bb01..44c102bc44b8a 100644 --- a/sdk/spring/azure-spring-cloud-starter-cache/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-cache/pom.xml @@ -25,7 +25,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 org.springframework.boot diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml index 4356a31b0fcfc..108d2e4bc9396 100644 --- a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml @@ -30,7 +30,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 diff --git a/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml b/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml index f4052e2d9e1aa..c4c5ed5765a2d 100644 --- a/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml @@ -22,7 +22,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 runtime diff --git a/sdk/spring/azure-spring-cloud-storage/pom.xml b/sdk/spring/azure-spring-cloud-storage/pom.xml index 016b8db42b569..320923ec9a61e 100644 --- a/sdk/spring/azure-spring-cloud-storage/pom.xml +++ b/sdk/spring/azure-spring-cloud-storage/pom.xml @@ -23,7 +23,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 diff --git a/sdk/spring/azure-spring-integration-core/pom.xml b/sdk/spring/azure-spring-integration-core/pom.xml index 53ee02c8afe83..2c66fadf0ff0b 100644 --- a/sdk/spring/azure-spring-integration-core/pom.xml +++ b/sdk/spring/azure-spring-integration-core/pom.xml @@ -26,7 +26,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 org.springframework diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index c23488976fbe3..ebb79ba90e4b7 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -37,7 +37,7 @@ com.azure.spring azure-spring-boot - 3.12.0 + 3.13.0-beta.1 com.azure.spring @@ -47,7 +47,7 @@ com.azure.spring azure-spring-cloud-context - 2.12.0 + 2.13.0-beta.1 com.azure.spring From 15be3a489aabf21ba906afd02597b23574b5efc6 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 24 Dec 2021 04:51:28 -0800 Subject: [PATCH 05/20] Increment version for spring releases (#26183) Increment package version after release of com.azure.spring azure-spring-integration-core --- eng/jacoco-test-coverage/pom.xml | 6 +++--- eng/versioning/version_client.txt | 6 +++--- .../CHANGELOG.md | 10 ++++++++++ .../azure-spring-boot-starter-keyvault-secrets/pom.xml | 2 +- sdk/spring/azure-spring-boot-test-application/pom.xml | 2 +- .../azure-spring-boot-test-keyvault/pom-reactive.xml | 2 +- sdk/spring/azure-spring-boot-test-keyvault/pom.xml | 2 +- sdk/spring/azure-spring-cloud-messaging/CHANGELOG.md | 10 ++++++++++ sdk/spring/azure-spring-cloud-messaging/pom.xml | 4 ++-- .../azure-spring-cloud-starter-eventhubs/pom.xml | 2 +- sdk/spring/azure-spring-integration-core/CHANGELOG.md | 10 ++++++++++ sdk/spring/azure-spring-integration-core/pom.xml | 2 +- sdk/spring/azure-spring-integration-eventhubs/pom.xml | 2 +- sdk/spring/azure-spring-integration-servicebus/pom.xml | 2 +- .../azure-spring-integration-storage-queue/pom.xml | 2 +- sdk/spring/azure-spring-integration-test/pom.xml | 2 +- sdk/spring/pom.xml | 4 ++-- 17 files changed, 50 insertions(+), 20 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 967db59e270cc..d5b4af296f345 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -449,7 +449,7 @@ com.azure.spring azure-spring-boot-starter-keyvault-secrets - 3.12.0 + 3.13.0-beta.1 com.azure.spring @@ -484,7 +484,7 @@ com.azure.spring azure-spring-integration-core - 2.12.0 + 2.13.0-beta.1 com.azure.spring @@ -519,7 +519,7 @@ com.azure.spring azure-spring-cloud-messaging - 2.12.0 + 2.13.0-beta.1 com.microsoft.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 338e070f0a4a4..05d3481873671 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -156,7 +156,7 @@ com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-active-directory;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-cosmos;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-keyvault-certificates;3.11.0;3.12.0 -com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.11.0;3.12.0 +com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.12.0;3.13.0-beta.1 com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-storage;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter;3.11.0;3.12.0 @@ -164,7 +164,7 @@ com.azure.spring:azure-spring-boot;3.12.0;3.13.0-beta.1 com.azure.spring:azure-spring-cloud-autoconfigure;2.11.0;2.12.0 com.azure.spring:azure-spring-cloud-context;2.12.0;2.13.0-beta.1 com.azure.spring:azure-spring-cloud-dependencies;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-messaging;2.11.0;2.12.0 +com.azure.spring:azure-spring-cloud-messaging;2.12.0;2.13.0-beta.1 com.azure.spring:azure-spring-cloud-starter-cache;2.11.0;2.12.0 com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;2.11.0;2.12.0 com.azure.spring:azure-spring-cloud-starter-eventhubs;2.11.0;2.12.0 @@ -176,7 +176,7 @@ com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;2.11.0;2.12.0 com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;2.11.0;2.12.0 com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;2.11.0;2.12.0 com.azure.spring:azure-spring-cloud-stream-binder-test;2.11.0;2.12.0 -com.azure.spring:azure-spring-integration-core;2.11.0;2.12.0 +com.azure.spring:azure-spring-integration-core;2.12.0;2.13.0-beta.1 com.azure.spring:azure-spring-integration-eventhubs;2.11.0;2.12.0 com.azure.spring:azure-spring-integration-servicebus;2.11.0;2.12.0 com.azure.spring:azure-spring-integration-storage-queue;2.11.0;2.12.0 diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md index 93805e78f87cd..01d84e22e26ef 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 3.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml index 1f40950c76e8e..31a63e0285dbe 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml @@ -13,7 +13,7 @@ com.azure.spring azure-spring-boot-starter-keyvault-secrets - 3.12.0 + 3.13.0-beta.1 Azure Spring Boot Starter for Azure Key Vault Secrets Spring Boot Starter supporting Azure Key Vault Secrets as PropertySource diff --git a/sdk/spring/azure-spring-boot-test-application/pom.xml b/sdk/spring/azure-spring-boot-test-application/pom.xml index d298b2a73357b..213a01d9e6bb7 100644 --- a/sdk/spring/azure-spring-boot-test-application/pom.xml +++ b/sdk/spring/azure-spring-boot-test-application/pom.xml @@ -36,7 +36,7 @@ com.azure.spring azure-spring-boot-starter-keyvault-secrets - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml b/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml index 393278f71c215..c7a23407b08fa 100644 --- a/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml +++ b/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-keyvault-secrets - 3.12.0 + 3.13.0-beta.1 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-test-keyvault/pom.xml b/sdk/spring/azure-spring-boot-test-keyvault/pom.xml index 6e2a407d52ed4..63ee0f48d4181 100644 --- a/sdk/spring/azure-spring-boot-test-keyvault/pom.xml +++ b/sdk/spring/azure-spring-boot-test-keyvault/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-keyvault-secrets - 3.12.0 + 3.13.0-beta.1 com.azure.spring diff --git a/sdk/spring/azure-spring-cloud-messaging/CHANGELOG.md b/sdk/spring/azure-spring-cloud-messaging/CHANGELOG.md index 865b47880c93d..e9ada6d3f7bbf 100644 --- a/sdk/spring/azure-spring-cloud-messaging/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-messaging/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-messaging/pom.xml b/sdk/spring/azure-spring-cloud-messaging/pom.xml index 597dc425fd766..0be15d34e31c2 100644 --- a/sdk/spring/azure-spring-cloud-messaging/pom.xml +++ b/sdk/spring/azure-spring-cloud-messaging/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-messaging - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Messaging @@ -30,7 +30,7 @@ com.azure.spring azure-spring-integration-core - 2.12.0 + 2.13.0-beta.1 + 2.13.0-beta.1 diff --git a/sdk/spring/azure-spring-integration-core/CHANGELOG.md b/sdk/spring/azure-spring-integration-core/CHANGELOG.md index eda2b8294ce55..f3239fec6f823 100644 --- a/sdk/spring/azure-spring-integration-core/CHANGELOG.md +++ b/sdk/spring/azure-spring-integration-core/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-integration-core/pom.xml b/sdk/spring/azure-spring-integration-core/pom.xml index 2c66fadf0ff0b..47e5c52f7aec0 100644 --- a/sdk/spring/azure-spring-integration-core/pom.xml +++ b/sdk/spring/azure-spring-integration-core/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-integration-core - 2.12.0 + 2.13.0-beta.1 Azure Spring Integration Core https://github.com/Azure/azure-sdk-for-java diff --git a/sdk/spring/azure-spring-integration-eventhubs/pom.xml b/sdk/spring/azure-spring-integration-eventhubs/pom.xml index d91018977039d..4d7012562e118 100644 --- a/sdk/spring/azure-spring-integration-eventhubs/pom.xml +++ b/sdk/spring/azure-spring-integration-eventhubs/pom.xml @@ -26,7 +26,7 @@ com.azure.spring azure-spring-integration-core - 2.12.0 + 2.13.0-beta.1 com.azure diff --git a/sdk/spring/azure-spring-integration-servicebus/pom.xml b/sdk/spring/azure-spring-integration-servicebus/pom.xml index 528e6fa684538..35fffb1ce1b8a 100644 --- a/sdk/spring/azure-spring-integration-servicebus/pom.xml +++ b/sdk/spring/azure-spring-integration-servicebus/pom.xml @@ -26,7 +26,7 @@ com.azure.spring azure-spring-integration-core - 2.12.0 + 2.13.0-beta.1 com.azure diff --git a/sdk/spring/azure-spring-integration-storage-queue/pom.xml b/sdk/spring/azure-spring-integration-storage-queue/pom.xml index 65c3be7a8d1a4..454d0c7264ecb 100644 --- a/sdk/spring/azure-spring-integration-storage-queue/pom.xml +++ b/sdk/spring/azure-spring-integration-storage-queue/pom.xml @@ -27,7 +27,7 @@ com.azure.spring azure-spring-integration-core - 2.12.0 + 2.13.0-beta.1 com.azure.spring diff --git a/sdk/spring/azure-spring-integration-test/pom.xml b/sdk/spring/azure-spring-integration-test/pom.xml index 20985f23c5894..e410830526433 100644 --- a/sdk/spring/azure-spring-integration-test/pom.xml +++ b/sdk/spring/azure-spring-integration-test/pom.xml @@ -26,7 +26,7 @@ com.azure.spring azure-spring-integration-core - 2.12.0 + 2.13.0-beta.1 org.mockito diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index ebb79ba90e4b7..5e5a244f84b21 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -57,7 +57,7 @@ com.azure.spring azure-spring-integration-core - 2.12.0 + 2.13.0-beta.1 com.azure.spring @@ -77,7 +77,7 @@ com.azure.spring azure-spring-cloud-messaging - 2.12.0 + 2.13.0-beta.1 com.azure.spring From 2b2a378f133a5b26a28f21f0bb0d4eb96500bc50 Mon Sep 17 00:00:00 2001 From: Yi Liu Date: Fri, 24 Dec 2021 22:05:50 +0800 Subject: [PATCH 06/20] udpate jca changelog for release (#26181) --- sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md index 5dca40273e60b..b95dcbd5376ff 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md @@ -1,14 +1,9 @@ # Release History -## 2.4.0-beta.1 (Unreleased) +## 2.4.0 (2021-12-24) -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes +### Dependency Upgrades +Regular updates for dependency versions. ## 2.3.0 (2021-11-25) ### Dependency Upgrades From 450490dfb4b9ba52d7f969cc9185124fb36a8391 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 24 Dec 2021 06:48:05 -0800 Subject: [PATCH 07/20] Increment version for keyvault releases (#26185) Increment package version after release of com.azure azure-security-keyvault-jca --- eng/jacoco-test-coverage/pom.xml | 2 +- eng/versioning/version_client.txt | 2 +- sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md | 10 ++++++++++ sdk/keyvault/azure-security-keyvault-jca/pom.xml | 2 +- sdk/keyvault/azure-security-test-keyvault-jca/pom.xml | 2 +- .../pom.xml | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index d5b4af296f345..f92e5d6cac89f 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -268,7 +268,7 @@ com.azure azure-security-keyvault-jca - 2.4.0 + 2.5.0-beta.1 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 05d3481873671..e7af3a008820c 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -117,7 +117,7 @@ com.azure:azure-security-attestation;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-security-confidentialledger;1.0.0-beta.2;1.0.0-beta.3 com.azure:azure-security-keyvault-administration;4.0.5;4.1.0-beta.4 com.azure:azure-security-keyvault-certificates;4.2.5;4.3.0-beta.4 -com.azure:azure-security-keyvault-jca;2.3.0;2.4.0 +com.azure:azure-security-keyvault-jca;2.4.0;2.5.0-beta.1 com.azure:azure-security-test-keyvault-jca;1.0.0;1.0.0 com.azure:azure-security-keyvault-keys;4.3.5;4.4.0-beta.6 com.azure:azure-security-keyvault-secrets;4.3.5;4.4.0-beta.4 diff --git a/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md index b95dcbd5376ff..887f44d5588e8 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.5.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.4.0 (2021-12-24) ### Dependency Upgrades diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index d5d7a0c0f9b0d..b649fde17d5b5 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -14,7 +14,7 @@ com.azure azure-security-keyvault-jca - 2.4.0 + 2.5.0-beta.1 JCA Provider for Azure Key Vault The Java Crypto Architecture (JCA) Provider for Azure Key Vault diff --git a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml index 05fa582c5ab26..3f7e932f7089a 100644 --- a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml @@ -27,7 +27,7 @@ com.azure azure-security-keyvault-jca - 2.4.0 + 2.5.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml index fe350370e0bbe..57f172559325a 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml @@ -41,7 +41,7 @@ com.azure azure-security-keyvault-jca - 2.4.0 + 2.5.0-beta.1 org.springframework.boot From f9dede55e860e7e0c598305102174b3dd68d2968 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 27 Dec 2021 17:31:35 -0800 Subject: [PATCH 08/20] Increment version for spring releases (#26177) --- eng/jacoco-test-coverage/pom.xml | 2 +- eng/versioning/version_client.txt | 2 +- sdk/spring/azure-identity-spring/CHANGELOG.md | 10 ++++++++++ sdk/spring/azure-identity-spring/pom.xml | 2 +- sdk/spring/azure-spring-cloud-context/pom.xml | 2 +- sdk/spring/pom.xml | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index f92e5d6cac89f..d96599fad65a5 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -424,7 +424,7 @@ com.azure.spring azure-identity-spring - 1.12.0 + 1.13.0-beta.1 com.azure.spring diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index e7af3a008820c..8e9077dc75ba6 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -150,7 +150,7 @@ com.azure.spring:azure-spring-cloud-appconfiguration-config;2.2.0;2.3.0 com.azure.spring:azure-spring-cloud-feature-management-web;2.1.0;2.2.0 com.azure.spring:azure-spring-cloud-feature-management;2.1.0;2.2.0 com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.2.0;2.3.0 -com.azure.spring:azure-identity-spring;1.11.0;1.12.0 +com.azure.spring:azure-identity-spring;1.12.0;1.13.0-beta.1 com.azure.spring:azure-spring-boot-bom;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-active-directory;3.11.0;3.12.0 diff --git a/sdk/spring/azure-identity-spring/CHANGELOG.md b/sdk/spring/azure-identity-spring/CHANGELOG.md index 85b5834715224..beee5f33494ad 100644 --- a/sdk/spring/azure-identity-spring/CHANGELOG.md +++ b/sdk/spring/azure-identity-spring/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-identity-spring/pom.xml b/sdk/spring/azure-identity-spring/pom.xml index 880a82234b34c..303094860c971 100644 --- a/sdk/spring/azure-identity-spring/pom.xml +++ b/sdk/spring/azure-identity-spring/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-identity-spring - 1.12.0 + 1.13.0-beta.1 jar Azure Identity Spring Integration Library diff --git a/sdk/spring/azure-spring-cloud-context/pom.xml b/sdk/spring/azure-spring-cloud-context/pom.xml index f2a7654957869..a1c69f96b4cbc 100644 --- a/sdk/spring/azure-spring-cloud-context/pom.xml +++ b/sdk/spring/azure-spring-cloud-context/pom.xml @@ -66,7 +66,7 @@ com.azure.spring azure-identity-spring - 1.12.0 + 1.13.0-beta.1 diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index 5e5a244f84b21..de2cca0b53a8e 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -32,7 +32,7 @@ com.azure.spring azure-identity-spring - 1.12.0 + 1.13.0-beta.1 com.azure.spring From e57efb3507c3a68f4d590169ccbf2544a99d7b7f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 27 Dec 2021 17:33:14 -0800 Subject: [PATCH 09/20] Increment version for spring releases (#26184) --- eng/jacoco-test-coverage/pom.xml | 46 +++++++++---------- eng/versioning/version_client.txt | 46 +++++++++---------- .../CHANGELOG.md | 10 ++++ .../pom.xml | 2 +- .../CHANGELOG.md | 10 ++++ .../pom.xml | 2 +- .../CHANGELOG.md | 10 ++++ .../azure-spring-boot-starter-cosmos/pom.xml | 2 +- .../CHANGELOG.md | 10 ++++ .../pom.xml | 2 +- .../CHANGELOG.md | 10 ++++ .../pom.xml | 2 +- .../CHANGELOG.md | 10 ++++ .../azure-spring-boot-starter-storage/pom.xml | 2 +- .../azure-spring-boot-starter/CHANGELOG.md | 10 ++++ sdk/spring/azure-spring-boot-starter/pom.xml | 2 +- .../azure-spring-boot-test-aad-b2c/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- sdk/spring/azure-spring-boot-test-aad/pom.xml | 2 +- .../azure-spring-boot-test-core/pom.xml | 2 +- .../azure-spring-boot-test-cosmos/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../azure-spring-boot-test-storage/pom.xml | 2 +- .../CHANGELOG.md | 10 ++++ .../azure-spring-cloud-autoconfigure/pom.xml | 8 ++-- .../CHANGELOG.md | 10 ++++ .../azure-spring-cloud-starter-cache/pom.xml | 4 +- .../CHANGELOG.md | 10 ++++ .../pom.xml | 4 +- .../CHANGELOG.md | 10 ++++ .../pom.xml | 6 +-- .../CHANGELOG.md | 10 ++++ .../pom.xml | 6 +-- .../CHANGELOG.md | 10 ++++ .../pom.xml | 6 +-- .../azure-spring-cloud-storage/CHANGELOG.md | 10 ++++ sdk/spring/azure-spring-cloud-storage/pom.xml | 4 +- .../CHANGELOG.md | 10 ++++ .../pom.xml | 6 +-- .../CHANGELOG.md | 10 ++++ .../pom.xml | 6 +-- .../CHANGELOG.md | 10 ++++ .../pom.xml | 6 +-- .../CHANGELOG.md | 10 ++++ .../pom.xml | 6 +-- .../CHANGELOG.md | 10 ++++ .../pom.xml | 4 +- .../pom.xml | 2 +- .../azure-spring-cloud-test-eventhubs/pom.xml | 4 +- .../pom.xml | 4 +- .../CHANGELOG.md | 10 ++++ .../pom.xml | 4 +- .../CHANGELOG.md | 10 ++++ .../pom.xml | 4 +- .../CHANGELOG.md | 10 ++++ .../pom.xml | 4 +- .../CHANGELOG.md | 10 ++++ .../azure-spring-integration-test/pom.xml | 2 +- sdk/spring/pom.xml | 18 ++++---- 62 files changed, 347 insertions(+), 117 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index d96599fad65a5..5e3f13417a19c 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -434,17 +434,17 @@ com.azure.spring azure-spring-boot-starter - 3.12.0 + 3.13.0-beta.1 com.azure.spring azure-spring-boot-starter-active-directory - 3.12.0 + 3.13.0-beta.1 com.azure.spring azure-spring-boot-starter-keyvault-certificates - 3.12.0 + 3.13.0-beta.1 com.azure.spring @@ -454,22 +454,22 @@ com.azure.spring azure-spring-boot-starter-servicebus-jms - 3.12.0 + 3.13.0-beta.1 com.azure.spring azure-spring-boot-starter-active-directory-b2c - 3.12.0 + 3.13.0-beta.1 com.azure.spring azure-spring-boot-starter-cosmos - 3.12.0 + 3.13.0-beta.1 com.azure.spring azure-spring-boot-starter-storage - 3.12.0 + 3.13.0-beta.1 com.azure @@ -489,32 +489,32 @@ com.azure.spring azure-spring-integration-test - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-integration-eventhubs - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-integration-servicebus - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-integration-storage-queue - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-storage - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-autoconfigure - 2.12.0 + 2.13.0-beta.1 com.azure.spring @@ -529,52 +529,52 @@ com.azure.spring azure-spring-cloud-starter-cache - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-starter-eventhubs - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-starter-eventhubs-kafka - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-starter-servicebus - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-starter-storage-queue - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-stream-binder-servicebus-core - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-stream-binder-test - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-stream-binder-servicebus-topic - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-stream-binder-servicebus-queue - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-stream-binder-eventhubs - 2.12.0 + 2.13.0-beta.1 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 8e9077dc75ba6..1b7f260cb9073 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -152,35 +152,35 @@ com.azure.spring:azure-spring-cloud-feature-management;2.1.0;2.2.0 com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.2.0;2.3.0 com.azure.spring:azure-identity-spring;1.12.0;1.13.0-beta.1 com.azure.spring:azure-spring-boot-bom;3.11.0;3.12.0 -com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.11.0;3.12.0 -com.azure.spring:azure-spring-boot-starter-active-directory;3.11.0;3.12.0 -com.azure.spring:azure-spring-boot-starter-cosmos;3.11.0;3.12.0 -com.azure.spring:azure-spring-boot-starter-keyvault-certificates;3.11.0;3.12.0 +com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.12.0;3.13.0-beta.1 +com.azure.spring:azure-spring-boot-starter-active-directory;3.12.0;3.13.0-beta.1 +com.azure.spring:azure-spring-boot-starter-cosmos;3.12.0;3.13.0-beta.1 +com.azure.spring:azure-spring-boot-starter-keyvault-certificates;3.12.0;3.13.0-beta.1 com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.12.0;3.13.0-beta.1 -com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.11.0;3.12.0 -com.azure.spring:azure-spring-boot-starter-storage;3.11.0;3.12.0 -com.azure.spring:azure-spring-boot-starter;3.11.0;3.12.0 +com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.12.0;3.13.0-beta.1 +com.azure.spring:azure-spring-boot-starter-storage;3.12.0;3.13.0-beta.1 +com.azure.spring:azure-spring-boot-starter;3.12.0;3.13.0-beta.1 com.azure.spring:azure-spring-boot;3.12.0;3.13.0-beta.1 -com.azure.spring:azure-spring-cloud-autoconfigure;2.11.0;2.12.0 +com.azure.spring:azure-spring-cloud-autoconfigure;2.12.0;2.13.0-beta.1 com.azure.spring:azure-spring-cloud-context;2.12.0;2.13.0-beta.1 com.azure.spring:azure-spring-cloud-dependencies;2.11.0;2.12.0 com.azure.spring:azure-spring-cloud-messaging;2.12.0;2.13.0-beta.1 -com.azure.spring:azure-spring-cloud-starter-cache;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-starter-eventhubs;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-starter-servicebus;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-starter-storage-queue;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-storage;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;2.11.0;2.12.0 -com.azure.spring:azure-spring-cloud-stream-binder-test;2.11.0;2.12.0 +com.azure.spring:azure-spring-cloud-starter-cache;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-starter-eventhubs;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-starter-servicebus;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-starter-storage-queue;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-storage;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-cloud-stream-binder-test;2.12.0;2.13.0-beta.1 com.azure.spring:azure-spring-integration-core;2.12.0;2.13.0-beta.1 -com.azure.spring:azure-spring-integration-eventhubs;2.11.0;2.12.0 -com.azure.spring:azure-spring-integration-servicebus;2.11.0;2.12.0 -com.azure.spring:azure-spring-integration-storage-queue;2.11.0;2.12.0 -com.azure.spring:azure-spring-integration-test;2.11.0;2.12.0 +com.azure.spring:azure-spring-integration-eventhubs;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-integration-servicebus;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-integration-storage-queue;2.12.0;2.13.0-beta.1 +com.azure.spring:azure-spring-integration-test;2.12.0;2.13.0-beta.1 com.azure.spring:azure-spring-boot-test-aad;1.0.0;1.0.0 com.azure.spring:azure-spring-boot-test-aad-b2c;1.0.0;1.0.0 com.azure.spring:azure-spring-boot-test-selenium-common;1.0.0;1.0.0 diff --git a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md index 08ae8340fc72f..c96a50d62c687 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 3.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml index 1a4bdb52bca2c..f5e9ec0aa7465 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml @@ -13,7 +13,7 @@ com.azure.spring azure-spring-boot-starter-active-directory-b2c - 3.12.0 + 3.13.0-beta.1 Azure Spring Boot Starter for Azure AD B2C Spring Security Integration Spring Boot Starter for Azure AD B2C and Spring Security Integration diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md index 783b7c3c2e82d..1e98b7ce8941a 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 3.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml index 8d21ac3514832..41a2f8f937894 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml @@ -13,7 +13,7 @@ com.azure.spring azure-spring-boot-starter-active-directory - 3.12.0 + 3.13.0-beta.1 Azure Spring Boot Starter for Azure AD Spring Security Integration Spring Boot Starter for Azure AD and Spring Security Integration diff --git a/sdk/spring/azure-spring-boot-starter-cosmos/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-cosmos/CHANGELOG.md index 821789a6a7a13..8527e2b8d37db 100644 --- a/sdk/spring/azure-spring-boot-starter-cosmos/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-cosmos/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 3.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml b/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml index ae518bdfd80c4..7644e606c35df 100644 --- a/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml @@ -13,7 +13,7 @@ com.azure.spring azure-spring-boot-starter-cosmos - 3.12.0 + 3.13.0-beta.1 Azure Spring Boot Starter for Azure Cosmos DB Spring Boot Starter for Azure Document DB service diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/CHANGELOG.md index e24538da88d2a..47a590c204461 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 3.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml index 57f172559325a..095f5f2a353e1 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml @@ -13,7 +13,7 @@ com.azure.spring azure-spring-boot-starter-keyvault-certificates - 3.12.0 + 3.13.0-beta.1 Azure Spring Boot Starter for Azure Key Vault Certificates Spring Boot Starter supporting Azure Key Vault Certificates diff --git a/sdk/spring/azure-spring-boot-starter-servicebus-jms/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-servicebus-jms/CHANGELOG.md index 6055294f6cf87..78886879f063a 100644 --- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 3.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml index f14d7e52ddf7c..633064c294c24 100644 --- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml @@ -13,7 +13,7 @@ com.azure.spring azure-spring-boot-starter-servicebus-jms - 3.12.0 + 3.13.0-beta.1 Azure Spring Boot Starter for Azure Service Bus JMS Spring Boot Starter for Azure Service Bus JMS diff --git a/sdk/spring/azure-spring-boot-starter-storage/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-storage/CHANGELOG.md index 7acbd42199935..bbdfccf910e55 100644 --- a/sdk/spring/azure-spring-boot-starter-storage/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-storage/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 3.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-spring-boot-starter-storage/pom.xml b/sdk/spring/azure-spring-boot-starter-storage/pom.xml index 0ca232fbe92e3..e9850e9b6bd74 100644 --- a/sdk/spring/azure-spring-boot-starter-storage/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-storage/pom.xml @@ -13,7 +13,7 @@ com.azure.spring azure-spring-boot-starter-storage - 3.12.0 + 3.13.0-beta.1 Azure Spring Boot Starter for Azure Storage Spring Boot Starter for Azure Storage diff --git a/sdk/spring/azure-spring-boot-starter/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter/CHANGELOG.md index 43dce93de5727..c1c0856942470 100644 --- a/sdk/spring/azure-spring-boot-starter/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 3.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/spring/azure-spring-boot-starter/pom.xml b/sdk/spring/azure-spring-boot-starter/pom.xml index 7f0919f495194..82b6d92ca8f83 100644 --- a/sdk/spring/azure-spring-boot-starter/pom.xml +++ b/sdk/spring/azure-spring-boot-starter/pom.xml @@ -13,7 +13,7 @@ com.azure.spring azure-spring-boot-starter - 3.12.0 + 3.13.0-beta.1 Azure Spring Boot Starter Core starter, including auto-configuration support diff --git a/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml b/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml index 598c9880f75cb..d44c2289d3b33 100644 --- a/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-active-directory-b2c - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml b/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml index 873a43bd2987c..35589e70941ea 100644 --- a/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-active-directory - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml b/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml index e2846ba526bce..dd6db7b55ac66 100644 --- a/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-active-directory - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-test-aad-webapp-and-resource-server-with-obo/pom.xml b/sdk/spring/azure-spring-boot-test-aad-webapp-and-resource-server-with-obo/pom.xml index efc032c9e4f2d..e2ad9c0d37ba6 100644 --- a/sdk/spring/azure-spring-boot-test-aad-webapp-and-resource-server-with-obo/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad-webapp-and-resource-server-with-obo/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-active-directory - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-test-aad/pom.xml b/sdk/spring/azure-spring-boot-test-aad/pom.xml index e77d47b9b604a..0c5029064576e 100644 --- a/sdk/spring/azure-spring-boot-test-aad/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-active-directory - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-test-core/pom.xml b/sdk/spring/azure-spring-boot-test-core/pom.xml index 849b87a0636f3..f20e252b412c9 100644 --- a/sdk/spring/azure-spring-boot-test-core/pom.xml +++ b/sdk/spring/azure-spring-boot-test-core/pom.xml @@ -71,7 +71,7 @@ com.azure.spring azure-spring-boot-starter - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-test-cosmos/pom.xml b/sdk/spring/azure-spring-boot-test-cosmos/pom.xml index 065c54caee491..a171a104edc74 100644 --- a/sdk/spring/azure-spring-boot-test-cosmos/pom.xml +++ b/sdk/spring/azure-spring-boot-test-cosmos/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-cosmos - 3.12.0 + 3.13.0-beta.1 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-test-keyvault-certificate/pom.xml b/sdk/spring/azure-spring-boot-test-keyvault-certificate/pom.xml index 11d94981a9749..757e1d654a118 100644 --- a/sdk/spring/azure-spring-boot-test-keyvault-certificate/pom.xml +++ b/sdk/spring/azure-spring-boot-test-keyvault-certificate/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-keyvault-certificates - 3.12.0 + 3.13.0-beta.1 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml b/sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml index 38b3b0fcb68f1..051bbb4eb8baa 100644 --- a/sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml +++ b/sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml @@ -19,7 +19,7 @@ com.azure.spring azure-spring-boot-starter-servicebus-jms - 3.12.0 + 3.13.0-beta.1 diff --git a/sdk/spring/azure-spring-boot-test-storage/pom.xml b/sdk/spring/azure-spring-boot-test-storage/pom.xml index d5db5dfa36222..93e2b34fee8e1 100644 --- a/sdk/spring/azure-spring-boot-test-storage/pom.xml +++ b/sdk/spring/azure-spring-boot-test-storage/pom.xml @@ -20,7 +20,7 @@ com.azure.spring azure-spring-boot-starter-storage - 3.12.0 + 3.13.0-beta.1 com.azure.spring diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/CHANGELOG.md b/sdk/spring/azure-spring-cloud-autoconfigure/CHANGELOG.md index 925a3b26ac262..1a82e1d0005ea 100644 --- a/sdk/spring/azure-spring-cloud-autoconfigure/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-autoconfigure/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml index eed542956c0f1..741757f6644d1 100644 --- a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml +++ b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-autoconfigure - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Autoconfigure https://github.com/Azure/azure-sdk-for-java @@ -78,7 +78,7 @@ com.azure.spring azure-spring-integration-eventhubs - 2.12.0 + 2.13.0-beta.1 true @@ -86,7 +86,7 @@ com.azure.spring azure-spring-integration-servicebus - 2.12.0 + 2.13.0-beta.1 true @@ -159,7 +159,7 @@ com.azure.spring azure-spring-cloud-storage - 2.12.0 + 2.13.0-beta.1 test diff --git a/sdk/spring/azure-spring-cloud-starter-cache/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-cache/CHANGELOG.md index 5a4b8a6f5a767..aa21ce3e18c30 100644 --- a/sdk/spring/azure-spring-cloud-starter-cache/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-starter-cache/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-starter-cache/pom.xml b/sdk/spring/azure-spring-cloud-starter-cache/pom.xml index 44c102bc44b8a..5ebf3bc8f2456 100644 --- a/sdk/spring/azure-spring-cloud-starter-cache/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-cache/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-starter-cache - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Starter Cache @@ -20,7 +20,7 @@ com.azure.spring azure-spring-cloud-autoconfigure - 2.12.0 + 2.13.0-beta.1 com.azure.spring diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/CHANGELOG.md index ea52bfa62ee9a..74a347fd9693b 100644 --- a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml index 108d2e4bc9396..c07f5d0a11289 100644 --- a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-starter-eventhubs-kafka - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Starter Event Hubs Kafka @@ -20,7 +20,7 @@ com.azure.spring azure-spring-cloud-autoconfigure - 2.12.0 + 2.13.0-beta.1 org.springframework.cloud diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-eventhubs/CHANGELOG.md index 80c29fdd39690..34a848b419a13 100644 --- a/sdk/spring/azure-spring-cloud-starter-eventhubs/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-starter-eventhubs/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-starter-eventhubs/pom.xml index 0f6c99d96788f..09f5ff39776fd 100644 --- a/sdk/spring/azure-spring-cloud-starter-eventhubs/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-eventhubs/pom.xml @@ -12,19 +12,19 @@ com.azure.spring azure-spring-cloud-starter-eventhubs - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Starter Event Hubs com.azure.spring azure-spring-cloud-autoconfigure - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-integration-eventhubs - 2.12.0 + 2.13.0-beta.1 com.azure.spring diff --git a/sdk/spring/azure-spring-cloud-starter-servicebus/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-servicebus/CHANGELOG.md index 56bafb15fc09b..38130fb35424b 100644 --- a/sdk/spring/azure-spring-cloud-starter-servicebus/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-starter-servicebus/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml b/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml index f0571484785a2..39789eae7b8de 100644 --- a/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml @@ -12,19 +12,19 @@ com.azure.spring azure-spring-cloud-starter-servicebus - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Starter Service Bus com.azure.spring azure-spring-cloud-autoconfigure - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-integration-servicebus - 2.12.0 + 2.13.0-beta.1 com.azure diff --git a/sdk/spring/azure-spring-cloud-starter-storage-queue/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-storage-queue/CHANGELOG.md index c7a396308f0ec..d541bec4be979 100644 --- a/sdk/spring/azure-spring-cloud-starter-storage-queue/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-starter-storage-queue/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml b/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml index c4c5ed5765a2d..3c3df8a8fb94e 100644 --- a/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml @@ -15,7 +15,7 @@ com.azure.spring azure-spring-cloud-starter-storage-queue - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Starter Storage Queue @@ -28,12 +28,12 @@ com.azure.spring azure-spring-cloud-storage - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-integration-storage-queue - 2.12.0 + 2.13.0-beta.1 diff --git a/sdk/spring/azure-spring-cloud-storage/CHANGELOG.md b/sdk/spring/azure-spring-cloud-storage/CHANGELOG.md index 7b004f2ebe597..ab5ac3a64390d 100644 --- a/sdk/spring/azure-spring-cloud-storage/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-storage/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-storage/pom.xml b/sdk/spring/azure-spring-cloud-storage/pom.xml index 320923ec9a61e..01a6201e4a343 100644 --- a/sdk/spring/azure-spring-cloud-storage/pom.xml +++ b/sdk/spring/azure-spring-cloud-storage/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-storage - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Storage @@ -44,7 +44,7 @@ com.azure.spring azure-spring-integration-storage-queue - 2.12.0 + 2.13.0-beta.1 true diff --git a/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/CHANGELOG.md b/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/CHANGELOG.md index 789a5bd4785b0..c9524aa475206 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/pom.xml index aac1acae2e191..efa95982271e0 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/pom.xml +++ b/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-stream-binder-eventhubs - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Stream Event Hubs binder https://github.com/Azure/azure-sdk-for-java @@ -31,7 +31,7 @@ com.azure.spring azure-spring-cloud-starter-eventhubs - 2.12.0 + 2.13.0-beta.1 @@ -58,7 +58,7 @@ com.azure.spring azure-spring-cloud-stream-binder-test - 2.12.0 + 2.13.0-beta.1 test + 2.13.0-beta.1 Azure Spring Cloud Stream Service Bus Binder Core https://github.com/Azure/azure-sdk-for-java @@ -30,12 +30,12 @@ com.azure.spring azure-spring-cloud-autoconfigure - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-starter-servicebus - 2.12.0 + 2.13.0-beta.1 com.azure diff --git a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/CHANGELOG.md b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/CHANGELOG.md index 16ccaf539e766..a85e0807915b1 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/CHANGELOG.md +++ b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/pom.xml b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/pom.xml index df26f0b56c3fb..8672d02273514 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/pom.xml +++ b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-stream-binder-servicebus-queue - 2.12.0 + 2.13.0-beta.1 Azure Spring Cloud Stream Service Bus Queue Binder Azure Service Bus Queue binder for Spring Cloud Stream @@ -27,7 +27,7 @@ com.azure.spring azure-spring-cloud-stream-binder-servicebus-core - 2.12.0 + 2.13.0-beta.1 @@ -47,7 +47,7 @@ com.azure.spring azure-spring-cloud-stream-binder-test - 2.12.0 + 2.13.0-beta.1 test + 2.13.0-beta.1 Azure Spring Cloud Stream Service Bus Topic Binder Azure Service Bus binder for Spring Cloud Stream @@ -27,7 +27,7 @@ com.azure.spring azure-spring-cloud-stream-binder-servicebus-core - 2.12.0 + 2.13.0-beta.1 @@ -47,7 +47,7 @@ com.azure.spring azure-spring-cloud-stream-binder-test - 2.12.0 + 2.13.0-beta.1 test + 2.13.0-beta.1 Azure Spring Cloud Stream Binder Test https://github.com/Azure/azure-sdk-for-java @@ -67,7 +67,7 @@ com.azure.spring azure-spring-cloud-autoconfigure - 2.12.0 + 2.13.0-beta.1 com.fasterxml.jackson.core diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs-kafka/pom.xml b/sdk/spring/azure-spring-cloud-test-eventhubs-kafka/pom.xml index c4ef0b8c8d14e..a6d9d865a2cd1 100644 --- a/sdk/spring/azure-spring-cloud-test-eventhubs-kafka/pom.xml +++ b/sdk/spring/azure-spring-cloud-test-eventhubs-kafka/pom.xml @@ -26,7 +26,7 @@ com.azure.spring azure-spring-cloud-starter-eventhubs-kafka - 2.12.0 + 2.13.0-beta.1 org.springframework.kafka diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml index 319cb755ce20a..bbabadb6c5432 100644 --- a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml +++ b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml @@ -31,7 +31,7 @@ com.azure.spring azure-spring-cloud-stream-binder-eventhubs - 2.12.0 + 2.13.0-beta.1 com.azure.spring @@ -50,7 +50,7 @@ com.azure.spring azure-spring-cloud-stream-binder-test - 2.12.0 + 2.13.0-beta.1 diff --git a/sdk/spring/azure-spring-cloud-test-servicebus-binder/pom.xml b/sdk/spring/azure-spring-cloud-test-servicebus-binder/pom.xml index eb4130580202a..f20f30291b148 100644 --- a/sdk/spring/azure-spring-cloud-test-servicebus-binder/pom.xml +++ b/sdk/spring/azure-spring-cloud-test-servicebus-binder/pom.xml @@ -19,12 +19,12 @@ com.azure.spring azure-spring-cloud-stream-binder-servicebus-queue - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-stream-binder-servicebus-topic - 2.12.0 + 2.13.0-beta.1 org.springframework.boot diff --git a/sdk/spring/azure-spring-integration-eventhubs/CHANGELOG.md b/sdk/spring/azure-spring-integration-eventhubs/CHANGELOG.md index c98a38ad95d3a..7b7dcba0cec2b 100644 --- a/sdk/spring/azure-spring-integration-eventhubs/CHANGELOG.md +++ b/sdk/spring/azure-spring-integration-eventhubs/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-integration-eventhubs/pom.xml b/sdk/spring/azure-spring-integration-eventhubs/pom.xml index 4d7012562e118..27cca98d8cb71 100644 --- a/sdk/spring/azure-spring-integration-eventhubs/pom.xml +++ b/sdk/spring/azure-spring-integration-eventhubs/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-integration-eventhubs - 2.12.0 + 2.13.0-beta.1 Azure Spring Integration Event Hubs https://github.com/Azure/azure-sdk-for-java @@ -43,7 +43,7 @@ com.azure.spring azure-spring-integration-test - 2.12.0 + 2.13.0-beta.1 test + 2.13.0-beta.1 Azure Spring Integration Service Bus https://github.com/Azure/azure-sdk-for-java @@ -41,7 +41,7 @@ com.azure.spring azure-spring-integration-test - 2.12.0 + 2.13.0-beta.1 test + 2.13.0-beta.1 Azure Spring Integration Storage Queue https://github.com/Azure/azure-sdk-for-java @@ -32,7 +32,7 @@ com.azure.spring azure-spring-integration-test - 2.12.0 + 2.13.0-beta.1 test diff --git a/sdk/spring/azure-spring-integration-test/CHANGELOG.md b/sdk/spring/azure-spring-integration-test/CHANGELOG.md index 6689664b61027..8c949db99b230 100644 --- a/sdk/spring/azure-spring-integration-test/CHANGELOG.md +++ b/sdk/spring/azure-spring-integration-test/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.13.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.12.0 (2021-12-24) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1, and Spring Cloud 2020.0.0-2020.0.5, 2021.0.0. diff --git a/sdk/spring/azure-spring-integration-test/pom.xml b/sdk/spring/azure-spring-integration-test/pom.xml index e410830526433..0a93e583a92e7 100644 --- a/sdk/spring/azure-spring-integration-test/pom.xml +++ b/sdk/spring/azure-spring-integration-test/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-integration-test - 2.12.0 + 2.13.0-beta.1 Azure Spring Integration Test https://github.com/Azure/azure-sdk-for-java diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index de2cca0b53a8e..84d1a9e799815 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -42,7 +42,7 @@ com.azure.spring azure-spring-cloud-autoconfigure - 2.12.0 + 2.13.0-beta.1 com.azure.spring @@ -52,7 +52,7 @@ com.azure.spring azure-spring-cloud-storage - 2.12.0 + 2.13.0-beta.1 com.azure.spring @@ -62,17 +62,17 @@ com.azure.spring azure-spring-integration-eventhubs - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-integration-servicebus - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-integration-storage-queue - 2.12.0 + 2.13.0-beta.1 com.azure.spring @@ -82,22 +82,22 @@ com.azure.spring azure-spring-cloud-stream-binder-eventhubs - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-stream-binder-servicebus-core - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-stream-binder-servicebus-queue - 2.12.0 + 2.13.0-beta.1 com.azure.spring azure-spring-cloud-stream-binder-servicebus-topic - 2.12.0 + 2.13.0-beta.1 From b28642b11b4e2244fa607014fbeaab5b3e465422 Mon Sep 17 00:00:00 2001 From: Yi Liu Date: Wed, 29 Dec 2021 10:03:13 +0800 Subject: [PATCH 10/20] prepare release for azure-spring-boot-bom (#26208) --- sdk/boms/azure-spring-boot-bom/CHANGELOG.md | 10 ++++++++ sdk/boms/azure-spring-boot-bom/pom.xml | 27 +++++++-------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sdk/boms/azure-spring-boot-bom/CHANGELOG.md b/sdk/boms/azure-spring-boot-bom/CHANGELOG.md index 7b875330ebc7d..f0403a4fc73b3 100644 --- a/sdk/boms/azure-spring-boot-bom/CHANGELOG.md +++ b/sdk/boms/azure-spring-boot-bom/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 3.12.0 (2021-12-29) +This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. + +### Dependency Upgrades +- Upgrade to [spring-boot-dependencies:2.6.1](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.1/spring-boot-dependencies-2.6.1.pom). +- Upgrade Azure Spring versions to 3.12.0. + +### Breaking Changes +- Remove import of Azure SDK bom. + ## 3.11.0 (2021-11-26) This release is compatible with Spring Boot 2.5.0 - 2.5.4. diff --git a/sdk/boms/azure-spring-boot-bom/pom.xml b/sdk/boms/azure-spring-boot-bom/pom.xml index b932ccea58901..7168794b86159 100644 --- a/sdk/boms/azure-spring-boot-bom/pom.xml +++ b/sdk/boms/azure-spring-boot-bom/pom.xml @@ -47,15 +47,6 @@ - - - com.azure - azure-sdk-bom - 1.0.6 - pom - import - - com.azure @@ -72,47 +63,47 @@ com.azure.spring azure-spring-boot - 3.11.0 + 3.12.0 com.azure.spring azure-spring-boot-starter - 3.11.0 + 3.12.0 com.azure.spring azure-spring-boot-starter-active-directory - 3.11.0 + 3.12.0 com.azure.spring azure-spring-boot-starter-active-directory-b2c - 3.11.0 + 3.12.0 com.azure.spring azure-spring-boot-starter-cosmos - 3.11.0 + 3.12.0 com.azure.spring azure-spring-boot-starter-keyvault-secrets - 3.11.0 + 3.12.0 com.azure.spring azure-spring-boot-starter-keyvault-certificates - 3.11.0 + 3.12.0 com.azure.spring azure-spring-boot-starter-servicebus-jms - 3.11.0 + 3.12.0 com.azure.spring azure-spring-boot-starter-storage - 3.11.0 + 3.12.0 From eda0f008a639300158c3d8c97974fc3514dd635c Mon Sep 17 00:00:00 2001 From: Yi Liu Date: Thu, 6 Jan 2022 15:38:26 +0800 Subject: [PATCH 11/20] Prepare app config release (#26311) --- .../CHANGELOG.md | 2 +- .../CHANGELOG.md | 2 +- .../AppConfigurationProperties.java | 54 +++++++++++++++++++ .../spring/cloud/config/StateHolderTest.java | 2 +- .../CHANGELOG.md | 2 +- .../CHANGELOG.md | 2 +- .../CHANGELOG.md | 2 +- 7 files changed, 60 insertions(+), 6 deletions(-) diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md index 3ce6b2a633166..ff047912db0a9 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 2.3.0 (2021-12-24) +## 2.3.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ## 2.2.0 (2021-11-25) diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md index 104bcf6f8fac3..858fb5ac18931 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 2.3.0 (2021-12-24) +## 2.3.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ### Bugs Fixed diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/properties/AppConfigurationProperties.java b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/properties/AppConfigurationProperties.java index 08c13cdab73b4..750b706bc49e9 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/properties/AppConfigurationProperties.java +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/properties/AppConfigurationProperties.java @@ -6,10 +6,12 @@ import java.util.List; import javax.annotation.PostConstruct; +import javax.validation.constraints.NotEmpty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.context.annotation.Import; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; @@ -34,10 +36,21 @@ public final class AppConfigurationProperties { */ public static final String LABEL_SEPARATOR = ","; + /** + * Context for loading configuration keys. + */ + @NotEmpty + private String defaultContext = "application"; + private boolean enabled = true; private List stores = new ArrayList<>(); + /** + * Alternative to Spring application name, if not configured, fallback to default Spring application name + **/ + private String name; + @NestedConfigurationProperty private AppConfigManagedIdentityProperties managedIdentity; @@ -71,6 +84,47 @@ public void setStores(List stores) { this.stores = stores; } + /** + * The prefixed used before all keys loaded. + * @deprecated Use spring.cloud.azure.appconfiguration[0].selects + * @return null + */ + @Deprecated + public String getDefaultContext() { + return defaultContext; + } + + /** + * Overrides the default context of `applicaiton`. + * @deprecated Use spring.cloud.azure.appconfiguration[0].selects + * @param defaultContext Key Prefix. + */ + @Deprecated + public void setDefaultContext(String defaultContext) { + this.defaultContext = defaultContext; + } + + /** + * Used to override the spring.application.name value + * @deprecated Use spring.cloud.azure.appconfiguration[0].selects + * @return name + */ + @Deprecated + @Nullable + public String getName() { + return name; + } + + /** + * Used to override the spring.application.name value + * @deprecated Use spring.cloud.azure.appconfiguration[0].selects + * @param name application name in conifg key. + */ + @Deprecated + public void setName(@Nullable String name) { + this.name = name; + } + /** * @return the managedIdentity */ diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/test/java/com/azure/spring/cloud/config/StateHolderTest.java b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/test/java/com/azure/spring/cloud/config/StateHolderTest.java index f82ce95a6239b..a4c48379374be 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/test/java/com/azure/spring/cloud/config/StateHolderTest.java +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/test/java/com/azure/spring/cloud/config/StateHolderTest.java @@ -34,7 +34,7 @@ public void expireState() { @Test public void notExpireState() { - String endpoint = "testEndpoint"; + String endpoint = "notTestEndpoint"; List watchKeys = new ArrayList(); AppConfigurationStoreMonitoring monitoring = new AppConfigurationStoreMonitoring(); diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md index a8d5f084651cc..8f48d2d5a63dd 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 2.2.0 (2021-12-24) +## 2.2.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ## 2.1.0 (2021-11-25) diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md index f6db15e61a202..c1ed8ca55c656 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 2.2.0 (2021-12-24) +## 2.2.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ## 2.1.0 (2021-11-25) diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md index a942e23594b25..16ca901408418 100644 --- a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 2.3.0 (2021-12-24) +## 2.3.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. ## 2.2.0 (2021-11-25) From 1b2ad9a4c584aac70c03fe733d3d2d616244ddfb Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 6 Jan 2022 00:25:51 -0800 Subject: [PATCH 12/20] Increment version for appconfiguration releases (#26317) Increment package version after release of com.azure.spring azure-spring-cloud-feature-management --- eng/versioning/version_client.txt | 6 +++--- .../CHANGELOG.md | 10 ++++++++++ .../pom.xml | 4 ++-- .../CHANGELOG.md | 10 ++++++++++ .../azure-spring-cloud-appconfiguration-config/pom.xml | 2 +- .../azure-spring-cloud-feature-management-web/pom.xml | 4 ++-- .../azure-spring-cloud-feature-management/CHANGELOG.md | 10 ++++++++++ .../azure-spring-cloud-feature-management/pom.xml | 2 +- .../pom.xml | 2 +- 9 files changed, 40 insertions(+), 10 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 1b7f260cb9073..944eb3b641218 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -145,10 +145,10 @@ com.microsoft.azure:spring-cloud-azure-appconfiguration-config;1.3.0;1.4.0-beta. com.microsoft.azure:spring-cloud-azure-feature-management-web;1.3.0;1.4.0-beta.1 com.microsoft.azure:spring-cloud-azure-feature-management;1.3.0;1.4.0-beta.1 com.microsoft.azure:spring-cloud-starter-azure-appconfiguration-config;1.3.0;1.4.0-beta.1 -com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.2.0;2.3.0 -com.azure.spring:azure-spring-cloud-appconfiguration-config;2.2.0;2.3.0 +com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.3.0;2.4.0-beta.1 +com.azure.spring:azure-spring-cloud-appconfiguration-config;2.3.0;2.4.0-beta.1 com.azure.spring:azure-spring-cloud-feature-management-web;2.1.0;2.2.0 -com.azure.spring:azure-spring-cloud-feature-management;2.1.0;2.2.0 +com.azure.spring:azure-spring-cloud-feature-management;2.2.0;2.3.0-beta.1 com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.2.0;2.3.0 com.azure.spring:azure-identity-spring;1.12.0;1.13.0-beta.1 com.azure.spring:azure-spring-boot-bom;3.11.0;3.12.0 diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md index ff047912db0a9..f6932761cb2d6 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.4.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.3.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml index 1b453beee2805..c01840374e7f3 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-appconfiguration-config-web - 2.3.0 + 2.4.0-beta.1 Azure Spring Cloud App Configuration Config Web Integration of Spring Cloud Config and Azure App Configuration Service @@ -26,7 +26,7 @@ com.azure.spring azure-spring-cloud-appconfiguration-config - 2.3.0 + 2.4.0-beta.1 org.springframework.boot diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md index 858fb5ac18931..4e6021dc32e0e 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.4.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.3.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml index 4195d4fbbaef1..134b88e3f8824 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml @@ -12,7 +12,7 @@ com.azure.spring azure-spring-cloud-appconfiguration-config - 2.3.0 + 2.4.0-beta.1 Azure Spring Cloud App Configuration Config Integration of Spring Cloud Config and Azure App Configuration Service diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml index 464235ebde7ad..2f8bd92069356 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml @@ -47,7 +47,7 @@ com.azure.spring azure-spring-cloud-feature-management - 2.2.0 + 2.3.0-beta.1 + com.azure.spring:azure-spring-cloud-feature-management:[2.3.0-beta.1] javax.servlet:javax.servlet-api:[4.0.1] org.springframework:spring-web:[5.3.13] org.springframework:spring-webmvc:[5.3.13] diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md index c1ed8ca55c656..078118655599a 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.3.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.2.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml index e90d687943aeb..897caaf7d96c3 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml @@ -11,7 +11,7 @@ com.azure.spring azure-spring-cloud-feature-management - 2.2.0 + 2.3.0-beta.1 Azure Spring Cloud Feature Management Adds Feature Management into Spring diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml index 19d2eb9f3550f..7e8e8abcaddf8 100644 --- a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml @@ -18,7 +18,7 @@ com.azure.spring azure-spring-cloud-appconfiguration-config-web - 2.3.0 + 2.4.0-beta.1 com.azure.spring From c27e396d6497e6fabadb67918c6a2a00865afb42 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 6 Jan 2022 17:20:31 -0800 Subject: [PATCH 13/20] Increment version for appconfiguration releases (#26320) --- eng/versioning/version_client.txt | 2 +- .../CHANGELOG.md | 10 ++++++++++ .../pom.xml | 2 +- .../pom.xml | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 944eb3b641218..6fe9d51d20d05 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -149,7 +149,7 @@ com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.3.0;2.4.0-beta com.azure.spring:azure-spring-cloud-appconfiguration-config;2.3.0;2.4.0-beta.1 com.azure.spring:azure-spring-cloud-feature-management-web;2.1.0;2.2.0 com.azure.spring:azure-spring-cloud-feature-management;2.2.0;2.3.0-beta.1 -com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.2.0;2.3.0 +com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.3.0;2.4.0-beta.1 com.azure.spring:azure-identity-spring;1.12.0;1.13.0-beta.1 com.azure.spring:azure-spring-boot-bom;3.11.0;3.12.0 com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.12.0;3.13.0-beta.1 diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md index 16ca901408418..3a6594d28fb1b 100644 --- a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.4.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.3.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml index 7e8e8abcaddf8..fb7daa8e86b36 100644 --- a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml @@ -11,7 +11,7 @@ com.azure.spring azure-spring-cloud-starter-appconfiguration-config - 2.3.0 + 2.4.0-beta.1 Azure Spring Cloud Starter App Configuration Config diff --git a/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml index 6aeb27eaeb917..bd6ffcf1acb18 100644 --- a/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml @@ -24,7 +24,7 @@ com.azure.spring azure-spring-cloud-starter-appconfiguration-config - 2.3.0 + 2.4.0-beta.1 com.azure.spring From 6b0e66580784849ae953bee5eaa343f39a405cc3 Mon Sep 17 00:00:00 2001 From: Yi Liu Date: Fri, 7 Jan 2022 11:01:57 +0800 Subject: [PATCH 14/20] Prepare bom relesae (#26349) --- eng/versioning/version_client.txt | 4 +- .../CHANGELOG.md | 10 +++ .../pom.xml | 2 +- .../pom.xml | 2 +- sdk/boms/azure-spring-boot-bom/CHANGELOG.md | 16 ++++ sdk/boms/azure-spring-boot-bom/pom.xml | 78 +++++++++++++++--- .../CHANGELOG.md | 17 ++++ .../azure-spring-cloud-dependencies/pom.xml | 79 +++++++++++++------ 8 files changed, 167 insertions(+), 41 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 6fe9d51d20d05..aed88c0a1d437 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -147,11 +147,11 @@ com.microsoft.azure:spring-cloud-azure-feature-management;1.3.0;1.4.0-beta.1 com.microsoft.azure:spring-cloud-starter-azure-appconfiguration-config;1.3.0;1.4.0-beta.1 com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.3.0;2.4.0-beta.1 com.azure.spring:azure-spring-cloud-appconfiguration-config;2.3.0;2.4.0-beta.1 -com.azure.spring:azure-spring-cloud-feature-management-web;2.1.0;2.2.0 +com.azure.spring:azure-spring-cloud-feature-management-web;2.2.0;2.3.0-beta.1 com.azure.spring:azure-spring-cloud-feature-management;2.2.0;2.3.0-beta.1 com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.3.0;2.4.0-beta.1 com.azure.spring:azure-identity-spring;1.12.0;1.13.0-beta.1 -com.azure.spring:azure-spring-boot-bom;3.11.0;3.12.0 +com.azure.spring:azure-spring-boot-bom;3.12.0;3.12.1 com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.12.0;3.13.0-beta.1 com.azure.spring:azure-spring-boot-starter-active-directory;3.12.0;3.13.0-beta.1 com.azure.spring:azure-spring-boot-starter-cosmos;3.12.0;3.13.0-beta.1 diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md index 8f48d2d5a63dd..b7c59bcdce16d 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 2.3.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 2.2.0 (2022-01-06) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml index 2f8bd92069356..2575adb901eeb 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml @@ -11,7 +11,7 @@ com.azure.spring azure-spring-cloud-feature-management-web - 2.2.0 + 2.3.0-beta.1 Azure Spring Cloud Feature Management Web Adds Feature Management into Spring Web diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml index fb7daa8e86b36..850b84fa9a831 100644 --- a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml @@ -23,7 +23,7 @@ com.azure.spring azure-spring-cloud-feature-management-web - 2.2.0 + 2.3.0-beta.1 diff --git a/sdk/boms/azure-spring-boot-bom/CHANGELOG.md b/sdk/boms/azure-spring-boot-bom/CHANGELOG.md index f0403a4fc73b3..fe7ad5ceb86e1 100644 --- a/sdk/boms/azure-spring-boot-bom/CHANGELOG.md +++ b/sdk/boms/azure-spring-boot-bom/CHANGELOG.md @@ -1,5 +1,21 @@ # Release History +## 3.12.1 (2022-01-06) +This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. + +### Dependency Upgrades +- Upgrade to [spring-boot-dependencies:2.6.1](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.1/spring-boot-dependencies-2.6.1.pom). +- Upgrade Azure Spring versions to 3.12.0. +- Upgrade to [Azure Identity 1.4.2](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity/CHANGELOG.md#142-2021-11-24). +- Upgrade to [Azure Key Vault JCA 2.4.0](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md). +- Upgrade to [Azure Spring Data Cosmos 3.15.0](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md#3160-2021-12-21). + +### Breaking Changes +- Remove import of Azure SDK bom. + +### Bugs Fixed +- Fix the bug of no dependency management of Azure SDK libraries. + ## 3.12.0 (2021-12-29) This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. diff --git a/sdk/boms/azure-spring-boot-bom/pom.xml b/sdk/boms/azure-spring-boot-bom/pom.xml index 7168794b86159..5b41db3632b30 100644 --- a/sdk/boms/azure-spring-boot-bom/pom.xml +++ b/sdk/boms/azure-spring-boot-bom/pom.xml @@ -5,7 +5,7 @@ com.azure.spring azure-spring-boot-bom - 3.12.0 + 3.12.1 pom Azure Spring Boot BOM @@ -37,6 +37,16 @@ UTF-8 ${project.build.directory} + 3.12.0 + 1.22.0 + 1.4.2 + 4.3.5 + 2.4.0 + 1.11.0 + 0.0.9 + 3.15.0 + 12.14.2 + 12.11.2 @@ -47,63 +57,105 @@ - com.azure azure-spring-data-cosmos - 3.15.0 + ${azure.spring.data.cosmos.version} com.microsoft.azure azure-servicebus-jms - 0.0.9 + ${azure.servicebus.jms.version} + + + + + com.azure + azure-core + ${azure.core.version} + + + + com.azure + azure-identity + ${azure.identity.version} + + + + com.microsoft.azure + msal4j + ${azure.msal.version} + + + + com.azure + azure-security-keyvault-secrets + ${azure.keyvault.secret.version} + + + + com.azure + azure-security-keyvault-jca + ${azure.keyvault.jca.version} + + + + com.azure + azure-storage-blob + ${azure.storage.blob.version} + + + + com.azure + azure-storage-file-share + ${azure.storage.fileshare.version} com.azure.spring azure-spring-boot - 3.12.0 + ${azure.spring.boot.version} com.azure.spring azure-spring-boot-starter - 3.12.0 + ${azure.spring.boot.version} com.azure.spring azure-spring-boot-starter-active-directory - 3.12.0 + ${azure.spring.boot.version} com.azure.spring azure-spring-boot-starter-active-directory-b2c - 3.12.0 + ${azure.spring.boot.version} com.azure.spring azure-spring-boot-starter-cosmos - 3.12.0 + ${azure.spring.boot.version} com.azure.spring azure-spring-boot-starter-keyvault-secrets - 3.12.0 + ${azure.spring.boot.version} com.azure.spring azure-spring-boot-starter-keyvault-certificates - 3.12.0 + ${azure.spring.boot.version} com.azure.spring azure-spring-boot-starter-servicebus-jms - 3.12.0 + ${azure.spring.boot.version} com.azure.spring azure-spring-boot-starter-storage - 3.12.0 + ${azure.spring.boot.version} diff --git a/sdk/boms/azure-spring-cloud-dependencies/CHANGELOG.md b/sdk/boms/azure-spring-cloud-dependencies/CHANGELOG.md index e8404da5c3193..778a23633038a 100644 --- a/sdk/boms/azure-spring-cloud-dependencies/CHANGELOG.md +++ b/sdk/boms/azure-spring-cloud-dependencies/CHANGELOG.md @@ -1,5 +1,22 @@ # Release History +## 2.12.0 (2022-01-06) +This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1. + +### Dependency Upgrades +- Upgrade to [spring-boot-dependencies:2.6.1](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.1/spring-boot-dependencies-2.6.1.pom). +- Upgrade Azure Spring versions to 2.12.0. +- Upgrade to [Azure Identity 1.4.2](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity/CHANGELOG.md#142-2021-11-24). +- Upgrade to [Azure Service Bus 7.5.1](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md#751-2021-12-08). +- Upgrade to [Azure Event Hubs 5.10.3](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md#5103-2021-11-16). +- Upgrade to [Azure Event Hubs Checkpoint Store Blob 1.10.2](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md#1102-2021-11-16). +- Upgrade to [Spring Cloud Azure App Configuration 2.3.0](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md). +- Upgrade to [Spring Cloud Azure App Configuration Web 2.3.0](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md). +- Upgrade to [Spring Cloud Azure Feature Management 2.2.0](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md). +- Upgrade to [Spring Cloud Azure Feature Management Web 2.2.0](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md). +### Breaking Changes +- Remove import of Azure SDK bom. + ## 2.11.0 (2021-11-26) This release is compatible with Spring Boot 2.5.0 - 2.5.4 and Spring Cloud 2020.0.3. diff --git a/sdk/boms/azure-spring-cloud-dependencies/pom.xml b/sdk/boms/azure-spring-cloud-dependencies/pom.xml index e87bdbf6089eb..f9ef244b5ac3d 100644 --- a/sdk/boms/azure-spring-cloud-dependencies/pom.xml +++ b/sdk/boms/azure-spring-cloud-dependencies/pom.xml @@ -43,97 +43,98 @@ UTF-8 ${project.build.directory} + 1.22.0 + 1.10.2 + 5.10.3 + 1.4.2 + 7.5.1 + ${project.version} + 12.11.2 2.10.0 - 2.2.0 - 2.2.0 - 2.1.0 + 2.3.0 + 2.3.0 + 2.2.0 - - com.azure - azure-sdk-bom - 1.0.6 - pom - import - + com.azure.spring azure-spring-integration-eventhubs - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-integration-servicebus - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-integration-storage-queue - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-context - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-autoconfigure - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-messaging - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-stream-binder-eventhubs - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-stream-binder-servicebus-topic - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-stream-binder-servicebus-queue - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-starter-cache - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-starter-servicebus - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-starter-eventhubs - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-starter-eventhubs-kafka - 2.11.0 + ${azure.spring.cloud.version} com.azure.spring azure-spring-cloud-starter-storage-queue - 2.11.0 + ${azure.spring.cloud.version} @@ -164,11 +165,41 @@ + + com.azure + azure-core + ${azure.core.version} + + + com.azure + azure-identity + ${azure.identity.version} + com.azure.resourcemanager azure-resourcemanager ${azure.resourcemanager.version} + + com.azure + azure-messaging-eventhubs + ${azure.eventhubs.version} + + + com.azure + azure-messaging-eventhubs-checkpointstore-blob + ${azure.eventhubs.checkpoint.version} + + + com.azure + azure-messaging-servicebus + ${azure.servicebus.version} + + + com.azure + azure-storage-queue + ${azure.storage.queue.version} + From c175af04c5ab6163862d5f30096e0368e0c91b7c Mon Sep 17 00:00:00 2001 From: yiliu6 Date: Mon, 10 Jan 2022 09:43:42 +0800 Subject: [PATCH 15/20] exclude test code when shading jca --- sdk/keyvault/azure-security-keyvault-jca/pom.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 4ef870391c4f6..f0f6a9e3107ad 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -61,12 +61,6 @@ 4.0.0 test - - com.azure - azure-core-test - 1.7.6 - test - org.junit.jupiter @@ -110,6 +104,7 @@ shade + false true true From 38da627d02f3fd5b2b1845d2dcea9aed725211cb Mon Sep 17 00:00:00 2001 From: yiliu6 Date: Mon, 10 Jan 2022 11:06:19 +0800 Subject: [PATCH 16/20] remove azure-core-test and use azure-core for jca test --- sdk/keyvault/azure-security-keyvault-jca/pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index f0f6a9e3107ad..4b6ea1f7d8bab 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -61,6 +61,12 @@ 4.0.0 test + + com.azure + azure-core + 1.24.0 + test + org.junit.jupiter @@ -104,7 +110,7 @@ shade - false + true true From 677d7bf6b9ed5412c4097b7d83b2f2ff00970e0f Mon Sep 17 00:00:00 2001 From: yiliu6 Date: Mon, 10 Jan 2022 11:16:49 +0800 Subject: [PATCH 17/20] fix pipeline error --- sdk/keyvault/azure-security-keyvault-jca/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 4b6ea1f7d8bab..619373b13cb95 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -64,7 +64,7 @@ com.azure azure-core - 1.24.0 + 1.24.0 test @@ -110,7 +110,7 @@ shade - + false true true From 6d933e218b3d5e644b1850b557ed9cd72c7e19d7 Mon Sep 17 00:00:00 2001 From: yiliu6 Date: Mon, 10 Jan 2022 17:15:59 +0800 Subject: [PATCH 18/20] modify pipeline for skipping main compilation --- eng/pipelines/templates/jobs/ci.yml | 5 ++++- eng/pipelines/templates/stages/archetype-sdk-client.yml | 4 ++++ sdk/keyvault/azure-security-keyvault-jca/pom.xml | 3 ++- sdk/keyvault/ci.yml | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml index b58b256086580..0fd95dcf9daee 100644 --- a/eng/pipelines/templates/jobs/ci.yml +++ b/eng/pipelines/templates/jobs/ci.yml @@ -34,6 +34,9 @@ parameters: - name: PreBuildSteps type: object default: [] + - name: MavenVerifyAdditionalOptions + type: string + default: '' jobs: - job: 'Build' @@ -297,7 +300,7 @@ jobs: displayName: 'Run SpotBugs, Checkstyle, RevApi, and Javadoc' inputs: mavenPomFile: pom.xml - options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -Dmaven.main.skip=true -Dmaven.test.skip=true -pl $(ProjectList)' + options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -Dmaven.main.skip=true -Dmaven.test.skip=true $(MavenVerifyAdditionalOptions) -pl $(ProjectList)' mavenOptions: '$(MemoryOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaBuildVersion) diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 5033aeac82dd1..0dd7b9a3a8a6f 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -47,6 +47,9 @@ parameters: - name: PreBuildSteps type: object default: [] +- name: MavenVerifyAdditionalOptions + type: string + default: '' stages: - stage: Build @@ -79,6 +82,7 @@ stages: - TestOptions=.*/-am - AZURE_TEST.*=.*/ PreBuildSteps: ${{ parameters.PreBuildSteps }} + MavenVerifyAdditionalOptions: ${{ parameters.MavenVerifyAdditionalOptions }} # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch. diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 619373b13cb95..4fcab6673f787 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -25,6 +25,7 @@ false + true @@ -111,7 +112,7 @@ false - true + ${createSourcesJar} true diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml index d286a80043250..14b14448293d3 100644 --- a/sdk/keyvault/ci.yml +++ b/sdk/keyvault/ci.yml @@ -57,6 +57,7 @@ extends: template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml parameters: ServiceDirectory: keyvault + MavenVerifyAdditionalOptions: '-DcreateSourcesJar=false' Artifacts: - name: azure-security-keyvault-administration groupId: com.azure From d4f8b73032ef44b2fbdcbe427bc412de1b1c24c3 Mon Sep 17 00:00:00 2001 From: yiliu6 Date: Mon, 10 Jan 2022 17:48:32 +0800 Subject: [PATCH 19/20] fix pipeline error --- eng/pipelines/templates/jobs/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml index 0fd95dcf9daee..4d32bfd2ce400 100644 --- a/eng/pipelines/templates/jobs/ci.yml +++ b/eng/pipelines/templates/jobs/ci.yml @@ -300,7 +300,7 @@ jobs: displayName: 'Run SpotBugs, Checkstyle, RevApi, and Javadoc' inputs: mavenPomFile: pom.xml - options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -Dmaven.main.skip=true -Dmaven.test.skip=true $(MavenVerifyAdditionalOptions) -pl $(ProjectList)' + options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -Dmaven.main.skip=true -Dmaven.test.skip=true ${{ parameters.ServiceDirectory }} -pl $(ProjectList)' mavenOptions: '$(MemoryOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaBuildVersion) From 2b5830601aafca5ad0374b6ddc6ed8455931f678 Mon Sep 17 00:00:00 2001 From: yiliu6 Date: Mon, 10 Jan 2022 21:21:09 +0800 Subject: [PATCH 20/20] fix pipeline error --- eng/pipelines/templates/jobs/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml index 4d32bfd2ce400..f098d16dcf656 100644 --- a/eng/pipelines/templates/jobs/ci.yml +++ b/eng/pipelines/templates/jobs/ci.yml @@ -300,7 +300,7 @@ jobs: displayName: 'Run SpotBugs, Checkstyle, RevApi, and Javadoc' inputs: mavenPomFile: pom.xml - options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -Dmaven.main.skip=true -Dmaven.test.skip=true ${{ parameters.ServiceDirectory }} -pl $(ProjectList)' + options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -Dmaven.main.skip=true -Dmaven.test.skip=true ${{ parameters.MavenVerifyAdditionalOptions }} -pl $(ProjectList)' mavenOptions: '$(MemoryOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaBuildVersion)