From a7cc5ace7a8569681763f163a3e55988e80a496c Mon Sep 17 00:00:00 2001 From: Yi Liu Date: Fri, 15 Oct 2021 11:18:41 +0800 Subject: [PATCH] add spring cloud stream binder starter modules (#24761) * add binder starters * skip verifying changlog * fix redundant configuration in spring/pom.xml --- eng/jacoco-test-coverage/pom.xml | 15 ++++++++ eng/versioning/version_client.txt | 3 ++ .../azure-spring-cloud-dependencies/pom.xml | 15 ++++++++ sdk/spring/ci.yml | 24 +++++++++++++ sdk/spring/pom.xml | 6 ++++ ...vOps-Release-WorkItems-For-SpringCloud.ps1 | 3 ++ .../pom.xml | 23 ++++++++++++ .../pom.xml | 24 +++++++++++++ .../pom.xml | 24 +++++++++++++ sdk/spring/spring-reference.yml | 36 +++++++++++++++++++ 10 files changed, 173 insertions(+) create mode 100644 sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml create mode 100644 sdk/spring/spring-cloud-azure-starter-stream-servicebus-queue/pom.xml create mode 100644 sdk/spring/spring-cloud-azure-starter-stream-servicebus-topic/pom.xml diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index f1a091e14208..78487f2bf0d6 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -552,11 +552,26 @@ spring-cloud-azure-stream-binder-servicebus-queue 4.0.0-beta.1 + + com.azure.spring + spring-cloud-azure-starter-stream-servicebus-queue + 4.0.0-beta.1 + + + com.azure.spring + spring-cloud-azure-starter-stream-servicebus-topic + 4.0.0-beta.1 + com.azure.spring spring-cloud-azure-stream-binder-eventhubs 4.0.0-beta.1 + + com.azure.spring + spring-cloud-azure-starter-stream-eventhubs + 4.0.0-beta.1 + com.azure.spring spring-cloud-azure-stream-binder-eventhubs-core diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 7b8a978968a2..b3c8c7dc94e0 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -186,9 +186,12 @@ com.azure.spring:spring-cloud-azure-starter-storage;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-starter;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;4.0.0-beta.1;4.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-stream-binder-servicebus-queue;4.0.0-beta.1;4.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-stream-servicebus-queue;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-stream-binder-servicebus-topic;4.0.0-beta.1;4.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-stream-servicebus-topic;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-stream-binder-test;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-test-appconfiguration-config;1.0.0;1.0.0 com.azure.spring:spring-cloud-azure-test-eventhubs-kafka;1.0.0;1.0.0 diff --git a/sdk/boms/azure-spring-cloud-dependencies/pom.xml b/sdk/boms/azure-spring-cloud-dependencies/pom.xml index 4d99e073f0fb..ca39af4023f5 100644 --- a/sdk/boms/azure-spring-cloud-dependencies/pom.xml +++ b/sdk/boms/azure-spring-cloud-dependencies/pom.xml @@ -145,11 +145,26 @@ spring-cloud-azure-starter-servicebus ${azure.spring.cloud.version} + + com.azure.spring + spring-cloud-azure-starter-stream-servicebus-queue + ${project.version} + + + com.azure.spring + spring-cloud-azure-starter-stream-servicebus-topic + ${project.version} + com.azure.spring spring-cloud-azure-starter-eventhubs ${azure.spring.cloud.version} + + com.azure.spring + spring-cloud-azure-starter-stream-eventhubs + ${project.version} + com.azure.spring spring-cloud-azure-starter-eventhubs-kafka diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml index 2ec297f698e0..8da5a990b86f 100644 --- a/sdk/spring/ci.yml +++ b/sdk/spring/ci.yml @@ -53,9 +53,12 @@ trigger: - sdk/spring/spring-cloud-azure-starter/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml + - sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-servicebus-queue/pom.xml + - sdk/spring/spring-cloud-azure-starter-stream-servicebus-queue/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-servicebus-topic/pom.xml + - sdk/spring/spring-cloud-azure-starter-stream-servicebus-topic/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-test/pom.xml - sdk/spring/spring-cloud-azure-test-servicebus-binder/pom.xml @@ -112,9 +115,12 @@ pr: - sdk/spring/spring-cloud-azure-starter/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml + - sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-servicebus-queue/pom.xml + - sdk/spring/spring-cloud-azure-starter-stream-servicebus-queue/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-servicebus-topic/pom.xml + - sdk/spring/spring-cloud-azure-starter-stream-servicebus-topic/pom.xml - sdk/spring/spring-cloud-azure-stream-binder-test/pom.xml - sdk/spring/spring-cloud-azure-test-servicebus-binder/pom.xml @@ -273,10 +279,28 @@ extends: groupId: com.azure.spring safeName: springcloudazurestreambinderservicebustopic skipPublishDocMs: true + - name: spring-cloud-azure-starter-stream-servicebus-topic + groupId: com.azure.spring + safeName: springcloudazurestarterstreamservicebustopic + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true - name: spring-cloud-azure-stream-binder-servicebus-queue groupId: com.azure.spring safeName: springcloudazurestreambinderservicebusqueue skipPublishDocMs: true + - name: spring-cloud-azure-starter-stream-servicebus-topic + groupId: com.azure.spring + safeName: springcloudazurestarterstreamservicebustopic + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-stream-eventhubs + groupId: com.azure.spring + safeName: springcloudazurestarterstreameventhubs + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true - name: spring-cloud-azure-stream-binder-eventhubs groupId: com.azure.spring safeName: springcloudazurestreambindereventhubs diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index 56ddc894f0be..c2c776dfe640 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -192,9 +192,12 @@ spring-cloud-azure-starter spring-cloud-azure-stream-binder-eventhubs-core spring-cloud-azure-stream-binder-eventhubs + spring-cloud-azure-starter-stream-eventhubs spring-cloud-azure-stream-binder-servicebus-core spring-cloud-azure-stream-binder-servicebus-queue + spring-cloud-azure-starter-stream-servicebus-queue spring-cloud-azure-stream-binder-servicebus-topic + spring-cloud-azure-starter-stream-servicebus-topic spring-cloud-azure-stream-binder-test spring-cloud-azure-test-eventhubs-kafka spring-cloud-azure-test-servicebus-binder @@ -235,9 +238,12 @@ spring-cloud-azure-starter spring-cloud-azure-stream-binder-eventhubs-core spring-cloud-azure-stream-binder-eventhubs + spring-cloud-azure-starter-stream-eventhubs spring-cloud-azure-stream-binder-servicebus-core spring-cloud-azure-stream-binder-servicebus-queue + spring-cloud-azure-starter-stream-servicebus-queue spring-cloud-azure-stream-binder-servicebus-topic + spring-cloud-azure-starter-stream-servicebus-topic spring-cloud-azure-stream-binder-test diff --git a/sdk/spring/scripts/Update-DevOps-Release-WorkItem/Update-DevOps-Release-WorkItems-For-SpringCloud.ps1 b/sdk/spring/scripts/Update-DevOps-Release-WorkItem/Update-DevOps-Release-WorkItems-For-SpringCloud.ps1 index a9154ff97e3e..94c6cdc2ed22 100644 --- a/sdk/spring/scripts/Update-DevOps-Release-WorkItem/Update-DevOps-Release-WorkItems-For-SpringCloud.ps1 +++ b/sdk/spring/scripts/Update-DevOps-Release-WorkItem/Update-DevOps-Release-WorkItems-For-SpringCloud.ps1 @@ -18,10 +18,13 @@ $springtCloudReleaseVersion = "2.6.0" . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-storage-queue . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion azure-spring-cloud-storage . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-eventhubs +. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-stream-eventhubs . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-eventhubs-core . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-servicebus-core . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-servicebus-queue +. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-stream-servicebus-queue . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-servicebus-topic +. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-stream-servicebus-topic . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-stream-binder-test . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion azure-spring-integration-core . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion azure-spring-integration-eventhubs diff --git a/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml new file mode 100644 index 000000000000..8cc9c35f4a36 --- /dev/null +++ b/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml @@ -0,0 +1,23 @@ + + + + 4.0.0 + + com.azure.spring + spring-cloud-azure-starter-stream-eventhubs + 4.0.0-beta.1 + + Spring Cloud Azure Starter Stream Event Hubs + Spring Cloud Azure Starter Stream Event Hubs + https://github.com/Azure/azure-sdk-for-java + + + + com.azure.spring + spring-cloud-azure-stream-binder-eventhubs + 4.0.0-beta.1 + + + diff --git a/sdk/spring/spring-cloud-azure-starter-stream-servicebus-queue/pom.xml b/sdk/spring/spring-cloud-azure-starter-stream-servicebus-queue/pom.xml new file mode 100644 index 000000000000..1980768cdbcb --- /dev/null +++ b/sdk/spring/spring-cloud-azure-starter-stream-servicebus-queue/pom.xml @@ -0,0 +1,24 @@ + + + + 4.0.0 + + com.azure.spring + spring-cloud-azure-starter-stream-servicebus-queue + 4.0.0-beta.1 + + Spring Cloud Azure Starter Stream Service Bus Queue + Spring Cloud Azure Starter Stream Service Bus Queue + https://github.com/Azure/azure-sdk-for-java + + + + com.azure.spring + spring-cloud-azure-stream-binder-servicebus-queue + 4.0.0-beta.1 + + + + diff --git a/sdk/spring/spring-cloud-azure-starter-stream-servicebus-topic/pom.xml b/sdk/spring/spring-cloud-azure-starter-stream-servicebus-topic/pom.xml new file mode 100644 index 000000000000..86ad9a1bfd65 --- /dev/null +++ b/sdk/spring/spring-cloud-azure-starter-stream-servicebus-topic/pom.xml @@ -0,0 +1,24 @@ + + + + 4.0.0 + + com.azure.spring + spring-cloud-azure-starter-stream-servicebus-topic + 4.0.0-beta.1 + + Spring Cloud Azure Starter Stream Service Bus Topic + Spring Cloud Azure Starter Stream Service Bus Topic + https://github.com/Azure/azure-sdk-for-java + + + + com.azure.spring + spring-cloud-azure-stream-binder-servicebus-topic + 4.0.0-beta.1 + + + + diff --git a/sdk/spring/spring-reference.yml b/sdk/spring/spring-reference.yml index 986a313eef06..71789b930748 100644 --- a/sdk/spring/spring-reference.yml +++ b/sdk/spring/spring-reference.yml @@ -324,6 +324,18 @@ groupId: com.azure.spring artifactId: azure-spring-cloud-stream-binder-servicebus-topic version: 2.2.0 + - artifactId: spring-cloud-azure-starter-stream-servicebus-topic + groupId: com.azure.spring + versionPreview: 4.0.0-beta.1 + description: Microsoft's Spring Cloud Stream Binder Starter provides Spring Cloud Stream Binder for Azure Service Bus Topic which allows you to build message-driven microservice using Spring Cloud Stream based on Azure Service Bus Topic. + type: spring + links: + repopath: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-stream-servicebus-topic + msdocs: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-cloud-stream-binder-java-app-with-service-bus + github: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/spring-cloud-azure-starter-stream-servicebus-topic + springProperties: + bom: azure-spring-cloud-dependencies + compatibilityRange: "[2.5.0,2.5.5)" - artifactId: spring-cloud-azure-stream-binder-servicebus-queue groupId: com.azure.spring versionGA: 4.0.0 @@ -348,6 +360,18 @@ groupId: com.azure.spring artifactId: azure-spring-cloud-stream-binder-servicebus-queue version: 2.2.0 + - artifactId: spring-cloud-azure-starter-stream-servicebus-queue + groupId: com.azure.spring + versionPreview: 4.0.0-beta.1 + description: Microsoft's Spring Cloud Stream Binder Starter provides Spring Cloud Stream Binder for Azure Service Bus Queue which allows you to build message-driven microservice using Spring Cloud Stream based on Azure Service Bus Queue. + type: spring + links: + repopath: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-stream-servicebus-queue + msdocs: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-cloud-stream-binder-java-app-with-service-bus + github: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/spring-cloud-azure-starter-stream-servicebus-queue + springProperties: + bom: azure-spring-cloud-dependencies + compatibilityRange: "[2.5.0,2.5.5)" - artifactId: spring-cloud-azure-starter-servicebus groupId: com.azure.spring versionGA: 4.0.0 @@ -460,6 +484,18 @@ groupId: com.azure.spring artifactId: azure-spring-cloud-stream-binder-eventhubs version: 2.2.0 + - artifactId: spring-cloud-azure-starter-stream-eventhubs + groupId: com.azure.spring + versionPreview: 4.0.0-beta.1 + description: Microsoft's Spring Cloud Stream Binder Starter provides Spring Cloud Stream Binder for Azure Event Hub which allows you to build message-driven microservice using Spring Cloud Stream based on Azure Event Hub service. + type: spring + links: + repopath: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-stream-eventhubs + msdocs: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-cloud-stream-binder-java-app-azure-event-hub + github: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/spring-cloud-azure-starter-stream-eventhubs + springProperties: + bom: azure-spring-cloud-dependencies + compatibilityRange: "[2.5.0,2.5.5)" - name: Event Hubs - Kafka description: The Event Hubs for Apache Kafka feature provides a protocol head on top of Azure Event Hubs that is protocol compatible with Apache Kafka clients built for Apache Kafka server versions 1.0 and later and supports for both reading from and writing to Event Hubs, which are equivalent to Apache Kafka topics. msdocs: https://docs.microsoft.com/azure/event-hubs/event-hubs-for-kafka-ecosystem-overview