Updated azure spring data cosmos group id and artifact id (#12925)

* Updated azure spring data cosmos group id and artifact id * Sorted version client to alphabetical list * Fixed tests.yml with new safename for azure spring data cosmos * Increasing timeout for cosmos emulator builds since download step takes most of the time * Added comments for increasing the timeout value
Azure · Jul 9, 2020 · feaf5d4 · feaf5d4
1 parent 8705591
commit feaf5d4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -274,9 +274,9 @@
       <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-data-gremlin-spring-boot-starter;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-data-cosmosdb</artifactId>
-      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-data-cosmosdb;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-data-cosmos</artifactId>
+      <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
     </dependency>
   </dependencies>
   <build>

diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -81,6 +81,9 @@ stages:
         ServiceDirectory: cosmos
         Artifacts: ${{ parameters.Artifacts }}
         AdditionalModules: ${{ parameters.AdditionalModules }}
+        # Increased timeout to 90 because of cosmos emulator taking 25-30 mins to download emulator
+        # Issue filed to improve download speed: https://github.com/Azure/azure-sdk-for-java/issues/12970
+        TimeoutInMinutes: 90
         Matrix:
           Tcp_Integration_Tests_Java8:
             OSVmImage: 'windows-2019'

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -36,6 +36,7 @@ com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.4
 com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.5
 com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.4
 com.azure:azure-sdk-template;1.0.4-beta.19;1.0.4-beta.20
+com.azure:azure-spring-data-cosmos;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-storage-blob;12.8.0-beta.1;12.8.0-beta.2
 com.azure:azure-storage-blob-batch;12.6.0-beta.1;12.6.0-beta.2
 com.azure:azure-storage-blob-changefeed;12.0.0-beta.1;12.0.0-beta.2
@@ -60,7 +61,6 @@ com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-tests;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-test-core;2.3.2;2.3.3-beta.1
-com.microsoft.azure:spring-data-cosmosdb;3.0.0-beta.1;3.0.0-beta.1
 
 # Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current
 # version. Unreleased dependencies are only valid for dependency versions.

diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos/pom.xml
@@ -10,9 +10,9 @@
     <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-data-cosmosdb</artifactId>
-  <version>3.0.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-data-cosmosdb;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-data-cosmos</artifactId>
+  <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
   <packaging>jar</packaging>
   <name>Spring Data for Azure Cosmos DB SQL API</name>
   <description>Spring Data for Azure Cosmos DB SQL API</description>

diff --git a/sdk/cosmos/ci.yml b/sdk/cosmos/ci.yml
@@ -43,8 +43,8 @@ extends:
       - name: azure-cosmos
         groupId: com.azure
         safeName: azurecosmos
-      - name: spring-data-cosmosdb
-        groupId: com.microsoft.azure
+      - name: azure-spring-data-cosmos
+        groupId: com.azure
         safeName: azurespringdatacosmos
     AdditionalModules:
       - name: azure-cosmos-benchmark

diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml
@@ -251,9 +251,9 @@ jobs:
         TestName: Integration_Test_Spring_Data_Cosmosdb
         ServiceDirectory: cosmos
         Artifacts:
-            - name: spring-data-cosmosdb
-              groupId: com.microsoft.azure
-              safeName: springdatacosmosdb
+            - name: azure-spring-data-cosmos
+              groupId: com.azure
+              safeName: azurespringdatacosmos
         TimeoutInMinutes: 90
         Matrix:
           Session_Integration: