Remove cache and eventhubs-kafka modules (#24940)

* remove spring-cloud-azure-starter-cache remove spring-cloud-azure-starter-eventhubs-kafka remove spring-cloud-azure-test-eventhubs-kafka * remove module starter-eventhubs-kafka remove module starter-cache
Azure · Oct 21, 2021 · f6b6463 · f6b6463
1 parent f8af57f
commit f6b6463
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 511 deletions.
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -502,21 +502,11 @@
       <artifactId>spring-cloud-azure-starter-storage</artifactId>
       <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-starter-storage;current} -->
     </dependency>
-    <dependency>
-      <groupId>com.azure.spring</groupId>
-      <artifactId>spring-cloud-azure-starter-cache</artifactId>
-      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-starter-cache;current} -->
-    </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-starter-eventhubs</artifactId>
       <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-starter-eventhubs;current} -->
     </dependency>
-    <dependency>
-      <groupId>com.azure.spring</groupId>
-      <artifactId>spring-cloud-azure-starter-eventhubs-kafka</artifactId>
-      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-starter-eventhubs-kafka;current} -->
-    </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-starter-servicebus</artifactId>

diff --git 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
@@ -144,11 +144,6 @@
         <artifactId>spring-cloud-azure-starter-actuator</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-starter-cache</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-starter-cosmos</artifactId>
@@ -159,11 +154,6 @@
         <artifactId>spring-cloud-azure-starter-eventhubs</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-starter-eventhubs-kafka</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-starter-keyvault-certificates</artifactId>

diff --git 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
 <!-- End Track2 Spring Cloud -->
 
 <!-- Begin Track1 Spring Boot starters -->
@@ -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
@@ -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
@@ -181,9 +181,7 @@
         <module>spring-cloud-azure-actuator-autoconfigure</module>
         <module>spring-cloud-azure-autoconfigure</module>
         <module>spring-cloud-azure-starter-actuator</module>
-        <module>spring-cloud-azure-starter-cache</module>
         <module>spring-cloud-azure-starter-cosmos</module>
-        <module>spring-cloud-azure-starter-eventhubs-kafka</module>
         <module>spring-cloud-azure-starter-eventhubs</module>
         <module>spring-cloud-azure-starter-keyvault-certificates</module>
         <module>spring-cloud-azure-starter-keyvault-secrets</module>
@@ -201,7 +199,6 @@
         <module>spring-cloud-azure-stream-binder-servicebus-topic</module>
         <module>spring-cloud-azure-starter-stream-servicebus-topic</module>
         <module>spring-cloud-azure-stream-binder-test</module>
-        <module>spring-cloud-azure-test-eventhubs-kafka</module>
         <module>spring-cloud-azure-test-servicebus-binder</module>
       </modules>
     </profile>
@@ -228,9 +225,7 @@
         <module>spring-cloud-azure-actuator-autoconfigure</module>
         <module>spring-cloud-azure-autoconfigure</module>
         <module>spring-cloud-azure-starter-actuator</module>
-        <module>spring-cloud-azure-starter-cache</module>
         <module>spring-cloud-azure-starter-cosmos</module>
-        <module>spring-cloud-azure-starter-eventhubs-kafka</module>
         <module>spring-cloud-azure-starter-eventhubs</module>
         <module>spring-cloud-azure-starter-keyvault-certificates</module>
         <module>spring-cloud-azure-starter-keyvault-secrets</module>

diff --git a/...cripts/Update-DevOps-Release-WorkItem/Update-DevOps-Release-WorkItems-For-SpringCloud.ps1 b/...cripts/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