diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 200d913ce130..2a54147e2d7c 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -502,21 +502,11 @@ spring-cloud-azure-starter-storage 4.0.0-beta.1 - - com.azure.spring - spring-cloud-azure-starter-cache - 4.0.0-beta.1 - com.azure.spring spring-cloud-azure-starter-eventhubs 4.0.0-beta.1 - - com.azure.spring - spring-cloud-azure-starter-eventhubs-kafka - 4.0.0-beta.1 - com.azure.spring spring-cloud-azure-starter-servicebus diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 45fe1de7ff6a..62dacbe730cb 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -169,9 +169,7 @@ com.azure.spring:spring-cloud-azure-messaging;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-resourcemanager;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-service;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-starter-actuator;4.0.0-beta.1;4.0.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-cache;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-starter-cosmos;4.0.0-beta.1;4.0.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-eventhubs-kafka;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-starter-eventhubs;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;4.0.0-beta.1;4.0.0-beta.1 com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;4.0.0-beta.1;4.0.0-beta.1 @@ -190,7 +188,6 @@ com.azure.spring:spring-cloud-azure-stream-binder-servicebus-topic;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 com.azure.spring:spring-cloud-azure-test-parent;1.0.0;1.0.0 com.azure.spring:spring-cloud-azure-test-servicebus-binder;1.0.0;1.0.0 com.azure.spring:spring-cloud-azure-test-storage;1.0.0;1.0.0 diff --git a/sdk/boms/spring-cloud-azure-dependencies/pom.xml b/sdk/boms/spring-cloud-azure-dependencies/pom.xml index 8a2f0a6d95c8..ee3b8b75a54f 100644 --- a/sdk/boms/spring-cloud-azure-dependencies/pom.xml +++ b/sdk/boms/spring-cloud-azure-dependencies/pom.xml @@ -144,11 +144,6 @@ spring-cloud-azure-starter-actuator ${project.version} - - com.azure.spring - spring-cloud-azure-starter-cache - ${project.version} - com.azure.spring spring-cloud-azure-starter-cosmos @@ -159,11 +154,6 @@ spring-cloud-azure-starter-eventhubs ${project.version} - - com.azure.spring - spring-cloud-azure-starter-eventhubs-kafka - ${project.version} - com.azure.spring spring-cloud-azure-starter-keyvault-certificates diff --git a/sdk/spring/README.md b/sdk/spring/README.md index aceec948ae6b..8af89dec3979 100644 --- a/sdk/spring/README.md +++ b/sdk/spring/README.md @@ -55,10 +55,8 @@ Below packages are available with latest release version. **We recommend users t > ❗ From Spring Cloud for Azure 2.0.0 onwards, we changed the groupId from `com.microsoft.azure` to `com.azure.spring`, and changed artifactIds, too. Artifact Id | Version for Spring Boot 2.3.x and 2.2.x | Version for Spring Boot 2.4.x ------- |--------- |--- -[azure-spring-cloud-starter-cache][azure-spring-cloud-starter-cache-readme] | [![Maven Central][azure-spring-cloud-starter-cache-mvn-2.2.x-img]][azure-spring-cloud-starter-cache-mvn-2.2.x] | [![Maven Central][azure-spring-cloud-starter-cache-mvn-2.3.x-img]][azure-spring-cloud-starter-cache-mvn-2.3.x] +------ |--------- |--- [azure-spring-cloud-stream-binder-eventhubs][azure-spring-cloud-stream-binder-eventhubs-readme] | [![Maven Central][azure-spring-cloud-stream-binder-eventhubs-mvn-2.2.x-img]][azure-spring-cloud-stream-binder-eventhubs-mvn-2.2.x] | [![Maven Central][azure-spring-cloud-stream-binder-eventhubs-mvn-2.3.x-img]][azure-spring-cloud-stream-binder-eventhubs-mvn-2.3.x] -[azure-spring-cloud-starter-eventhubs-kafka][azure-spring-cloud-starter-eventhubs-kafka-readme] | [![Maven Central][azure-spring-cloud-starter-eventhubs-kafka-mvn-2.2.x-img]][azure-spring-cloud-starter-eventhubs-kafka-mvn-2.2.x] | [![Maven Central][azure-spring-cloud-starter-eventhubs-kafka-mvn-2.3.x-img]][azure-spring-cloud-starter-eventhubs-kafka-mvn-2.3.x] [azure-spring-cloud-starter-eventhubs][azure-spring-cloud-starter-eventhubs-readme] | [![Maven Central][azure-spring-cloud-starter-eventhubs-mvn-2.2.x-img]][azure-spring-cloud-starter-eventhubs-mvn-2.2.x] | [![Maven Central][azure-spring-cloud-starter-eventhubs-mvn-2.3.x-img]][azure-spring-cloud-starter-eventhubs-mvn-2.3.x] [azure-spring-integration-eventhubs][azure-spring-integration-eventhubs-readme] | [![Maven Central][azure-spring-integration-eventhubs-mvn-2.2.x-img]][azure-spring-integration-eventhubs-mvn-2.2.x] | [![Maven Central][azure-spring-integration-eventhubs-mvn-2.3.x-img]][azure-spring-integration-eventhubs-mvn-2.3.x] [azure-spring-cloud-stream-binder-servicebus-queue][azure-spring-cloud-stream-binder-servicebus-queue-readme] | [![Maven Central][azure-spring-cloud-stream-binder-servicebus-queue-mvn-2.2.x-img]][azure-spring-cloud-stream-binder-servicebus-queue-mvn-2.2.x] | [![Maven Central][azure-spring-cloud-stream-binder-servicebus-queue-mvn-2.3.x-img]][azure-spring-cloud-stream-binder-servicebus-queue-mvn-2.3.x] @@ -77,10 +75,8 @@ spring-cloud-azure-appconfiguration-config | [![Maven Central][spring-cloud-azur spring-cloud-starter-azure-appconfiguration-config | [![Maven Central][spring-cloud-starter-azure-appconfiguration-config-mvn-1.2.x-img]][spring-cloud-starter-azure-appconfiguration-config-mvn-1.2.x] spring-cloud-azure-feature-management-web | [![Maven Central][spring-cloud-azure-feature-management-web-mvn-1.2.x-img]][spring-cloud-azure-feature-management-web-mvn-1.2.x] spring-cloud-azure-feature-management | [![Maven Central][spring-cloud-azure-feature-management-mvn-1.2.x-img]][spring-cloud-azure-feature-management-mvn-1.2.x] -spring-starter-azure-cache | [![Maven Central][azure-spring-cloud-starter-cache-mvn-1.2.x-img]][azure-spring-cloud-starter-cache-mvn-1.2.x] spring-cloud-azure-eventhubs-stream-binder | [![Maven Central][spring-cloud-azure-eventhubs-stream-binder-mvn-1.2.x-img]][spring-cloud-azure-eventhubs-stream-binder-mvn-1.2.x] spring-cloud-starter-azure-eventhubs | [![Maven Central][spring-cloud-starter-azure-eventhubs-mvn-1.2.x-img]][spring-cloud-starter-azure-eventhubs-mvn-1.2.x] -spring-cloud-starter-azure-eventhubs-kafka | [![Maven Central][spring-cloud-starter-azure-eventhubs-kafka-mvn-1.2.x-img]][spring-cloud-starter-azure-eventhubs-kafka-mvn-1.2.x] spring-cloud-azure-servicebus-queue-stream-binder | [![Maven Central][spring-cloud-azure-servicebus-queue-stream-binder-mvn-1.2.x-img]][spring-cloud-azure-servicebus-queue-stream-binder-mvn-1.2.x] spring-cloud-azure-servicebus-topic-stream-binder | [![Maven Central][spring-cloud-azure-servicebus-topic-stream-binder-mvn-1.2.x-img]][spring-cloud-azure-servicebus-topic-stream-binder-mvn-1.2.x] spring-cloud-starter-azure-servicebus | [![Maven Central][spring-cloud-starter-azure-servicebus-mvn-1.2.x-img]][spring-cloud-starter-azure-servicebus-mvn-1.2.x] @@ -241,12 +237,6 @@ This project collects usage data and sends it to Microsoft to help improve our p [azure-spring-cloud-starter-eventhubs-mvn-2.3.x-img]: https://img.shields.io/maven-central/v/com.azure.spring/azure-spring-cloud-starter-eventhubs.svg [azure-spring-cloud-starter-eventhubs-mvn-2.3.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22azure-spring-cloud-starter-eventhubs%22 -[azure-spring-cloud-starter-eventhubs-kafka-readme]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/spring/spring-cloud-azure-starter-eventhubs-kafka -[azure-spring-cloud-starter-eventhubs-kafka-mvn-2.2.x-img]: https://img.shields.io/maven-central/v/com.azure.spring/azure-spring-cloud-starter-eventhubs-kafka/2.2.svg -[azure-spring-cloud-starter-eventhubs-kafka-mvn-2.2.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22azure-spring-cloud-starter-eventhubs-kafka%22AND%20v:2.2.* -[azure-spring-cloud-starter-eventhubs-kafka-mvn-2.3.x-img]: https://img.shields.io/maven-central/v/com.azure.spring/azure-spring-cloud-starter-eventhubs-kafka.svg -[azure-spring-cloud-starter-eventhubs-kafka-mvn-2.3.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22azure-spring-cloud-starter-eventhubs-kafka%22 - [azure-spring-cloud-starter-servicebus-readme]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/spring-cloud-azure-starter-servicebus [azure-spring-cloud-starter-servicebus-mvn-2.2.x-img]: https://img.shields.io/maven-central/v/com.azure.spring/azure-spring-cloud-starter-servicebus/2.2.svg [azure-spring-cloud-starter-servicebus-mvn-2.2.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22azure-spring-cloud-starter-servicebus%22AND%20v:2.2.* @@ -259,13 +249,6 @@ This project collects usage data and sends it to Microsoft to help improve our p [azure-spring-cloud-starter-storage-queue-mvn-2.3.x-img]: https://img.shields.io/maven-central/v/com.azure.spring/azure-spring-cloud-starter-storage-queue.svg [azure-spring-cloud-starter-storage-queue-mvn-2.3.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22azure-spring-cloud-starter-storage-queue%22 -[azure-spring-cloud-starter-cache-readme]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/spring/azure-spring-cloud-starter-cache -[azure-spring-cloud-starter-cache-mvn-1.2.x-img]: https://img.shields.io/maven-central/v/com.microsoft.azure/spring-starter-azure-cache/1.2.svg -[azure-spring-cloud-starter-cache-mvn-1.2.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22spring-starter-azure-cache%20AND%20v:1.2.* -[azure-spring-cloud-starter-cache-mvn-2.2.x-img]: https://img.shields.io/maven-central/v/com.azure.spring/azure-spring-cloud-starter-cache/2.2.svg -[azure-spring-cloud-starter-cache-mvn-2.2.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22azure-spring-cloud-starter-cache%22AND%20v:2.2.* -[azure-spring-cloud-starter-cache-mvn-2.3.x-img]: https://img.shields.io/maven-central/v/com.azure.spring/azure-spring-cloud-starter-cache.svg -[azure-spring-cloud-starter-cache-mvn-2.3.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22azure-spring-cloud-starter-cache%22 @@ -356,9 +339,6 @@ This project collects usage data and sends it to Microsoft to help improve our p [spring-cloud-starter-azure-eventhubs-mvn-1.2.x-img]: https://img.shields.io/maven-central/v/com.microsoft.azure/spring-cloud-starter-azure-eventhubs/1.2.svg [spring-cloud-starter-azure-eventhubs-mvn-1.2.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22spring-cloud-starter-azure-eventhubs%20AND%20v:1.2.* -[spring-cloud-starter-azure-eventhubs-kafka-mvn-1.2.x-img]: https://img.shields.io/maven-central/v/com.microsoft.azure/spring-cloud-starter-azure-eventhubs-kafka/1.2.svg -[spring-cloud-starter-azure-eventhubs-kafka-mvn-1.2.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22spring-cloud-starter-azure-eventhubs-kafka%20AND%20v:1.2.* - [spring-cloud-starter-azure-servicebus-mvn-1.2.x-img]: https://img.shields.io/maven-central/v/com.microsoft.azure/spring-cloud-starter-azure-servicebus/1.2.svg [spring-cloud-starter-azure-servicebus-mvn-1.2.x]: https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22spring-cloud-starter-azure-servicebus%20AND%20v:1.2.* diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml index fe7f0d80863c..e1233f2090bb 100644 --- a/sdk/spring/ci.yml +++ b/sdk/spring/ci.yml @@ -35,9 +35,7 @@ trigger: - sdk/spring/spring-cloud-azure-autoconfigure/pom.xml - sdk/spring/spring-cloud-azure-messaging/pom.xml - sdk/spring/spring-cloud-azure-starter-actuator/pom.xml - - sdk/spring/spring-cloud-azure-starter-cache/pom.xml - sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml - - sdk/spring/spring-cloud-azure-starter-eventhubs-kafka/pom.xml - sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml - sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml - sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml @@ -92,9 +90,7 @@ pr: - sdk/spring/spring-cloud-azure-autoconfigure/pom.xml - sdk/spring/spring-cloud-azure-messaging/pom.xml - sdk/spring/spring-cloud-azure-starter-actuator/pom.xml - - sdk/spring/spring-cloud-azure-starter-cache/pom.xml - sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml - - sdk/spring/spring-cloud-azure-starter-eventhubs-kafka/pom.xml - sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml - sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml - sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml @@ -221,24 +217,12 @@ extends: skipPublishDocMs: true skipUpdatePackageJson: true skipVerifyChangelog: true - - name: spring-cloud-azure-starter-cache - groupId: com.azure.spring - safeName: springcloudazurestartercache - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - name: spring-cloud-azure-starter-eventhubs groupId: com.azure.spring safeName: springcloudazurestartereventhubs skipPublishDocMs: true skipUpdatePackageJson: true skipVerifyChangelog: true - - name: spring-cloud-azure-starter-eventhubs-kafka - groupId: com.azure.spring - safeName: springcloudazurestartereventhubskafka - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - name: spring-cloud-azure-starter-servicebus groupId: com.azure.spring safeName: springcloudazurestarterservicebus diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index 529f77629c09..d71a4957c880 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -181,9 +181,7 @@ spring-cloud-azure-actuator-autoconfigure spring-cloud-azure-autoconfigure spring-cloud-azure-starter-actuator - spring-cloud-azure-starter-cache spring-cloud-azure-starter-cosmos - spring-cloud-azure-starter-eventhubs-kafka spring-cloud-azure-starter-eventhubs spring-cloud-azure-starter-keyvault-certificates spring-cloud-azure-starter-keyvault-secrets @@ -201,7 +199,6 @@ 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 @@ -228,9 +225,7 @@ spring-cloud-azure-actuator-autoconfigure spring-cloud-azure-autoconfigure spring-cloud-azure-starter-actuator - spring-cloud-azure-starter-cache spring-cloud-azure-starter-cosmos - spring-cloud-azure-starter-eventhubs-kafka spring-cloud-azure-starter-eventhubs spring-cloud-azure-starter-keyvault-certificates spring-cloud-azure-starter-keyvault-secrets 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 94c6cdc2ed22..2c9868e0bd0b 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 @@ -11,9 +11,7 @@ $springtCloudReleaseVersion = "2.6.0" . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion azure-spring-eventhubs . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion azure-spring-servicebus . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion azure-spring-storage-queue -. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion azure-spring-cloud-starter-cache . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-eventhubs -. ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-eventhubs-kafka . ${PSScriptRoot}\Update-DevOps-Release-WorkItem-Util.ps1 $releaseDate $serviceDirectory $springtCloudReleaseVersion spring-cloud-azure-starter-servicebus . ${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 diff --git a/sdk/spring/spring-cloud-azure-starter-cache/pom.xml b/sdk/spring/spring-cloud-azure-starter-cache/pom.xml deleted file mode 100644 index 3bb3ca13faa7..000000000000 --- a/sdk/spring/spring-cloud-azure-starter-cache/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - 4.0.0 - - com.azure.spring - spring-cloud-azure-starter-cache - 4.0.0-beta.1 - - Spring Cloud Azure Starter Cache - Spring Cloud Azure Starter Cache - https://github.com/Azure/azure-sdk-for-java - - - 1.8 - 1.8 - - - - - com.azure.spring - spring-cloud-azure-autoconfigure - 4.0.0-beta.1 - - - org.springframework.boot - spring-boot-starter-cache - 2.5.4 - - - org.springframework.boot - spring-boot-starter-data-redis - 2.5.4 - - - com.azure.spring - spring-cloud-azure-resourcemanager - 4.0.0-beta.1 - - - - diff --git a/sdk/spring/spring-cloud-azure-starter-eventhubs-kafka/pom.xml b/sdk/spring/spring-cloud-azure-starter-eventhubs-kafka/pom.xml deleted file mode 100644 index 9c4996d1d7f7..000000000000 --- a/sdk/spring/spring-cloud-azure-starter-eventhubs-kafka/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - com.azure.spring - spring-cloud-azure-starter-eventhubs-kafka - 4.0.0-beta.1 - - Spring Cloud Azure Starter Event Hubs Kafka - Spring Cloud Azure Starter Event Hubs Kafka - https://github.com/Azure/azure-sdk-for-java - - - 1.8 - 1.8 - - - - - com.azure.spring - spring-cloud-azure-autoconfigure - 4.0.0-beta.1 - - - org.springframework.cloud - spring-cloud-starter-stream-kafka - 3.1.3 - - - com.azure.spring - spring-cloud-azure-resourcemanager - 4.0.0-beta.1 - - - - diff --git a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/pom.xml b/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/pom.xml deleted file mode 100644 index 5961963a84c2..000000000000 --- a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - com.azure.spring - spring-cloud-azure-test-parent - 1.0.0 - ../spring-cloud-azure-test-parent - - - 4.0.0 - spring-cloud-azure-test-eventhubs-kafka - com.azure.spring - 1.0.0 - - spring-cloud-azure-test-eventhubs-kafka - EventHubs Test project for Spring Cloud - - - - org.springframework.boot - spring-boot-starter-web - - - com.azure.spring - spring-cloud-azure-starter-eventhubs-kafka - 4.0.0-beta.1 - - - org.springframework.kafka - spring-kafka - 2.6.6 - - - org.springframework.boot - spring-boot-starter-logging - - - org.hibernate.validator - hibernate-validator - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.0 - - - default - - integration-test - - - ${skipSpringITs} - - - - - - - diff --git a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplication.java b/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplication.java deleted file mode 100644 index cf9e965457e0..000000000000 --- a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplication.java +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.sample.eventhubs.kafka; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.messaging.Message; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Sinks; - -import java.util.function.Consumer; -import java.util.function.Supplier; - -/** - * @author Warren Zhu - */ -@SpringBootApplication -public class EventHubKafkaBinderApplication { - - private static final Logger LOGGER = LoggerFactory.getLogger(EventHubKafkaBinderApplication.class); - - public static void main(String[] args) { - SpringApplication.run(EventHubKafkaBinderApplication.class, args); - } - - @Bean - public Sinks.Many> many() { - return Sinks.many().unicast().onBackpressureBuffer(); - } - - @Bean - public Supplier>> supply(Sinks.Many> many) { - return () -> many.asFlux() - .doOnNext(m -> LOGGER.info("Manually sending message {}", m)) - .doOnError(t -> LOGGER.error("Error encountered", t)); - } - - @Bean - public Consumer> consume() { - return message -> LOGGER.info("New message received: '{}'", message.getPayload()); - } -} diff --git a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplicationIT.java b/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplicationIT.java deleted file mode 100644 index ebae7fe219f9..000000000000 --- a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplicationIT.java +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.sample.eventhubs.kafka; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.test.system.OutputCaptureExtension; -import org.springframework.test.web.servlet.MockMvc; - -import java.util.UUID; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -@SpringBootTest(classes = EventHubKafkaBinderApplication.class) -@AutoConfigureMockMvc -@ExtendWith({ OutputCaptureExtension.class, MockitoExtension.class}) -public class EventHubKafkaBinderApplicationIT { - - @Autowired - private MockMvc mvc; - -// @Test - @Disabled // TODO (xiada): add test - public void testSendAndReceiveMessage(CapturedOutput capturedOutput) throws Exception { - Thread.sleep(10000); - String message = UUID.randomUUID().toString(); - mvc.perform(post("/messages?message=" + message)).andExpect(status().isOk()) - .andExpect(content().string(message)); - String messageReceivedLog = String.format("New message received: '%s'", message); - - boolean messageReceived = false; - for (int i = 0; i < 100; i++) { - String output = capturedOutput.toString(); - if (output.contains(messageReceivedLog)) { - messageReceived = true; - break; - } - - Thread.sleep(1000); - } - assertThat(messageReceived).isTrue(); - } -} diff --git a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/MessagesController.java b/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/MessagesController.java deleted file mode 100644 index d1254feb2201..000000000000 --- a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/MessagesController.java +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.sample.eventhubs.kafka; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.messaging.support.GenericMessage; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import reactor.core.publisher.Sinks; - -/** - * @author Warren Zhu - */ -@RestController -public class MessagesController { - - @Autowired - private Sinks.Many> many; - - @PostMapping("/messages") - public String sendMessage(@RequestParam String message) { - many.emitNext(new GenericMessage<>(message), Sinks.EmitFailureHandler.FAIL_FAST); - return message; - } -} diff --git a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/resources/application.yaml b/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/resources/application.yaml deleted file mode 100644 index d07e4f574d07..000000000000 --- a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/src/test/resources/application.yaml +++ /dev/null @@ -1,21 +0,0 @@ -spring: - main: - banner-mode: off - cloud: - azure: - client-id: ${SPRING_CLIENT_ID} - client-secret: ${SPRING_CLIENT_SECRET} - tenant-id: ${SPRING_TENANT_ID} - resource-group: ${SPRING_RESOURCE_GROUP} - subscription-id: ${SPRING_SUBSCRIPTION_ID} - eventhub: - namespace: ${EVENTHUB_NAMESPACE_NAME_SAMPLE_EVENTHUBS_KAFKA} - stream: - function: - definition: consume;supply - bindings: - consume-in-0: - destination: sample-eventhubs-kafka - group: $Default - supply-out-0: - destination: sample-eventhubs-kafka diff --git a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/test-resources.json b/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/test-resources.json deleted file mode 100644 index 72defdbdcee0..000000000000 --- a/sdk/spring/spring-cloud-azure-test-eventhubs-kafka/test-resources.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "baseName": { - "defaultValue": "[resourceGroup().name]", - "type": "String" - }, - "tenantId": { - "type": "String" - }, - "testApplicationId": { - "type": "String" - }, - "testApplicationSecret": { - "type": "String" - } - }, - "functions": [], - "variables": { - "eventHubsNamespaceName": "[concat(parameters('baseName'),'-sample-eventhubs-kafka')]", - "eventHubsNamespaceKeyName": "RootManageSharedAccessKey", - "location": "[resourceGroup().location]" - }, - "resources": [ - { - "type": "Microsoft.EventHub/namespaces", - "apiVersion": "2018-01-01-preview", - "name": "[variables('eventHubsNamespaceName')]", - "location": "[variables('location')]", - "sku": { - "name": "Standard", - "tier": "Standard", - "capacity": 1 - }, - "properties": { - "zoneRedundant": false, - "isAutoInflateEnabled": false, - "maximumThroughputUnits": 0, - "kafkaEnabled": true - } - }, - { - "type": "Microsoft.EventHub/namespaces/eventhubs", - "apiVersion": "2017-04-01", - "name": "[concat(variables('eventHubsNamespaceName'), '/sample-eventhubs-kafka')]", - "location": "[variables('location')]", - "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" - ], - "properties": { - "messageRetentionInDays": 1, - "partitionCount": 1, - "status": "Active" - } - }, - { - "type": "Microsoft.EventHub/namespaces/networkRuleSets", - "apiVersion": "2018-01-01-preview", - "name": "[concat(variables('eventHubsNamespaceName'), '/default')]", - "location": "[variables('location')]", - "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" - ], - "properties": { - "defaultAction": "Deny", - "virtualNetworkRules": [], - "ipRules": [] - } - }, - { - "type": "Microsoft.EventHub/namespaces/eventhubs/consumergroups", - "apiVersion": "2017-04-01", - "name": "[concat(variables('eventHubsNamespaceName'), '/sample-eventhubs-kafka/$Default')]", - "location": "[variables('location')]", - "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'sample-eventhubs-kafka')]", - "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" - ], - "properties": {} - } - ], - "outputs": { - "EVENTHUB_NAMESPACE_NAME_SAMPLE_EVENTHUBS_KAFKA": { - "type": "string", - "value": "[variables('eventHubsNamespaceName')]" - }, - "SPRING_TENANT_ID": { - "type": "string", - "value": "[parameters('tenantId')]" - }, - "SPRING_CLIENT_ID": { - "type": "string", - "value": "[parameters('testApplicationId')]" - }, - "SPRING_CLIENT_SECRET": { - "type": "string", - "value": "[parameters('testApplicationSecret')]" - }, - "SPRING_RESOURCE_GROUP": { - "type": "string", - "value": "[resourceGroup().name]" - }, - "SPRING_SUBSCRIPTION_ID": { - "type": "string", - "value": "[subscription().subscriptionId]" - } - } -} \ No newline at end of file diff --git a/sdk/spring/spring-reference.yml b/sdk/spring/spring-reference.yml index aa79e2a95fa2..1db4fb2f032d 100644 --- a/sdk/spring/spring-reference.yml +++ b/sdk/spring/spring-reference.yml @@ -526,31 +526,3 @@ 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 - artifacts: - - artifactId: spring-cloud-azure-starter-eventhubs-kafka - groupId: com.azure.spring - versionGA: 4.0.0 - versionPreview: 2.0.0-beta.1 - description: Microsoft's Spring Cloud Stream Binder helps developers to finish the auto-configuration of Event Hubs with Kafka protocol. - type: spring - links: - repopath: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-eventhubs-kafka - msdocs: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-cloud-stream-binder-java-app-kafka-azure-event-hub - github: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/spring-cloud-azure-starter-eventhubs-kafka - sample: https://github.com/Azure-Samples/azure-spring-boot-samples/tree/main/eventhubs/spring-cloud-azure-starter-eventhubs-kafka - springProperties: - starter: true - bom: azure-spring-cloud-dependencies - compatibilityRange: "[2.2.11.RELEASE,2.4.0-M1)" - mappings: - - compatibilityRange: "[2.0.0.RELEASE,2.3.0.M1)" - groupId: com.microsoft.azure - artifactId: spring-cloud-starter-azure-eventhubs-kafka - version: 1.2.4 - - compatibilityRange: "[2.2.11.RELEASE,2.4.0-M1)" - groupId: com.azure.spring - artifactId: azure-spring-cloud-starter-eventhubs-kafka - version: 2.2.0 diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml index da707e4532d5..d2a9a137f5d8 100644 --- a/sdk/spring/tests.yml +++ b/sdk/spring/tests.yml @@ -11,7 +11,6 @@ stages: - spring/azure-spring-boot-test-servicebus-jms - spring/azure-spring-boot-test-storage - spring/spring-cloud-azure-stream-binder-eventhubs - - spring/spring-cloud-azure-test-eventhubs-kafka - spring/spring-cloud-azure-test-servicebus-binder Artifacts: - name: azure-spring-boot-test-application @@ -38,9 +37,6 @@ stages: - name: azure-spring-boot-test-servicebus-jms groupId: com.azure.spring safeName: azurespringboottestservicebusjms - - name: spring-cloud-azure-test-eventhubs-kafka - groupId: com.azure.spring - safeName: springcloudazuretesteventhubskafka - name: azure-spring-boot-test-storage groupId: com.azure.spring safeName: azurespringbootteststorage