Moved azure-spring-data-cosmos-test to azure-spring-data-cosmos module

.github/CODEOWNERS

@@ -46,6 +46,8 @@
 /sdk/spring/spring-cloud-azure-appconfiguration-config*/ @mrm9084 @backwind1233 @chenrujun @hui1110 @netyyyy @saragluna @stliu @yiliuTo @moarychan @fangjian0423
 /sdk/spring/spring-cloud-azure-feature-management*/   @mrm9084 @backwind1233 @chenrujun @hui1110 @netyyyy @saragluna @stliu @yiliuTo @moarychan @fangjian0423
 /sdk/spring/spring-cloud-azure-starter-appconfiguration-config/ @mrm9084 @backwind1233 @chenrujun @hui1110 @netyyyy @saragluna @stliu @yiliuTo @moarychan @fangjian0423
+# PRLabel: %azure-spring
+/sdk/spring/azure-spring-data-cosmos/                @kushagraThapar @FabianMeiswinkel @backwind1233 @chenrujun @hui1110 @netyyyy @saragluna @stliu @yiliuTo @xinlian12 @moarychan @aayush3011 @simorenoh @fangjian0423 @jeet1995 @Pilchie
 
 
 # PRLabel: %Attestation
@@ -103,10 +105,6 @@
 
 # PRLabel: %Cosmos
 /sdk/cosmos/                                         @kushagraThapar @FabianMeiswinkel @kirankumarkolli @xinlian12 @milismsft @aayush3011 @simorenoh @jeet1995 @Pilchie
-# PRLabel: %azure-spring
-/sdk/cosmos/azure-spring-data-cosmos/                @kushagraThapar @FabianMeiswinkel @backwind1233 @chenrujun @hui1110 @netyyyy @saragluna @stliu @yiliuTo @xinlian12 @moarychan @aayush3011 @simorenoh @fangjian0423 @jeet1995 @Pilchie
-# PRLabel: %azure-spring
-/sdk/cosmos/azure-spring-data-cosmos-test/           @kushagraThapar @FabianMeiswinkel @backwind1233 @chenrujun @hui1110 @netyyyy @saragluna @stliu @yiliuTo @xinlian12 @moarychan @aayush3011 @simorenoh @fangjian0423 @jeet1995 @Pilchie
 
 # PRLabel: %Load Testing
 /sdk/loadtesting/                                    @Harshan01 @abranj1219

.vscode/cspell.json

@@ -132,7 +132,6 @@
     "sdk/cosmos/azure-cosmos-spark_3-3_2-12/**",
     "sdk/core/azure-core-test/**",
     "sdk/cosmos/azure-cosmos-encryption/**",
-    "sdk/spring/azure-spring-data-cosmos-test/**",
     "sdk/cosmos/azure-cosmos-spark_3_2-12/**",
     "sdk/spring/azure-spring-data-cosmos/**",
     "sdk/core/azure-json/**",

eng/bomgenerator/src/main/java/com/azure/tools/bomgenerator/Utils.java

@@ -48,7 +48,7 @@ public class Utils {
     public static final String ANALYZE_MODE = "analyze";
     public static final String GENERATE_MODE = "generate";
     public  static final Pattern COMMANDLINE_REGEX = Pattern.compile("-(.*)=(.*)");
-    public static final List<String> EXCLUSION_LIST = Arrays.asList("azure-spring-data-cosmos", "azure-spring-data-cosmos-test", "azure-core-test", "azure-sdk-all", "azure-sdk-parent", "azure-client-sdk-parent");
+    public static final List<String> EXCLUSION_LIST = Arrays.asList("azure-spring-data-cosmos", "azure-core-test", "azure-sdk-all", "azure-sdk-parent", "azure-client-sdk-parent");
     public static final Pattern SDK_DEPENDENCY_PATTERN = Pattern.compile("com.azure:(.+);(.+);(.+)");
     public static final String BASE_AZURE_GROUPID = "com.azure";
     public static final String AZURE_TEST_LIBRARY_IDENTIFIER = "-test";

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -449,6 +449,7 @@ the main ServiceBusClientBuilder. -->
   <suppress checks="EnforceFinalFields" files="com.azure.spring.data.cosmos.core.query.CosmosPageRequest"/>
 
   <!-- Checkstyle suppressions for azure.spring.data.cosmos package -->
+  <suppress checks="[a-zA-Z0-9]*" files="[/\\]azure-spring-data-cosmos[/\\]src[/\\]test[/\\]"/>
   <suppress checks="MethodName|MemberName|ParameterName" files="src[/\\]test[/\\]java[/\\]com[/\\]azure[/\\]spring[/\\]data[/\\]cosmos[/\\]domain|repository.*.java"/>
   <suppress checks="MethodName" files="com.azure.spring.data.cosmos.config.CosmosConfig.java"/>
   <suppress checks="MemberName" files="com.azure.spring.data.cosmos.MyItem.java"/>

eng/pipelines/templates/stages/cosmos-emulator-matrix.json

@@ -20,15 +20,25 @@
       },
       "Spring Emulator Only Integration Tests - Java 8": {
         "ProfileFlag": "-Pintegration-test-emulator",
-        "PROTOCOLS": "[\"Tcp\"]",
         "JavaTestVersion": "1.8",
-        "AdditionalArgs": "-Dspring-e2e -DargLine=\"-DACCOUNT_HOST=https://localhost:8081/ -DACCOUNT_KEY=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw== -DSECONDARY_ACCOUNT_KEY=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw== -DNEW_ACCOUNT_HOST=https://localhost:8081/ -DNEW_ACCOUNT_KEY=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw== -DNEW_SECONDARY_ACCOUNT_KEY=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==\""
+        "ACCOUNT_HOST": "https://localhost:8081/",
+        "ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+        "SECONDARY_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+        "NEW_ACCOUNT_HOST": "https://localhost:8081/",
+        "NEW_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+        "NEW_SECONDARY_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+        "AdditionalArgs": "-Dspring-e2e"
       },
       "Spring Emulator Only Integration Tests - Java 17": {
           "ProfileFlag": "-Pintegration-test-emulator",
-          "PROTOCOLS": "[\"Tcp\"]",
           "JavaTestVersion": "1.17",
-          "AdditionalArgs": "-Dspring-e2e -DargLine=\"-DACCOUNT_HOST=https://localhost:8081/ -DACCOUNT_KEY=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw== -DSECONDARY_ACCOUNT_KEY=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw== -DNEW_ACCOUNT_HOST=https://localhost:8081/ -DNEW_ACCOUNT_KEY=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw== -DNEW_SECONDARY_ACCOUNT_KEY=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==\""
+          "ACCOUNT_HOST": "https://localhost:8081/",
+          "ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+          "SECONDARY_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+          "NEW_ACCOUNT_HOST": "https://localhost:8081/",
+          "NEW_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+          "NEW_SECONDARY_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+          "AdditionalArgs": "-Dspring-e2e"
       },
       "Encryption Emulator Only Integration Tests": {
           "ProfileFlag": "-Pencryption-integration",

eng/versioning/version_client.txt

@@ -166,7 +166,6 @@ com.azure:azure-sdk-template;1.1.1234;1.2.2-beta.1
 com.azure:azure-sdk-template-two;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-sdk-template-three;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-spring-data-cosmos;3.34.0;3.35.0-beta.1
-com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-storage-blob;12.22.0;12.23.0-beta.1
 com.azure:azure-storage-blob-batch;12.18.0;12.19.0-beta.1
 com.azure:azure-storage-blob-changefeed;12.0.0-beta.18;12.0.0-beta.19

sdk/cosmos/ci.spring.yml

@@ -76,6 +76,3 @@ extends:
         groupId: com.azure
         safeName: azurespringdatacosmos
         releaseInBatch: false
-    AdditionalModules:
-      - name: azure-spring-data-cosmos-test
-        groupId: com.azure

sdk/cosmos/ci.yml

@@ -141,3 +141,5 @@ extends:
         groupId: com.azure
       - name: azure-cosmos-spark_3_2-12
         groupId: com.azure.cosmos.spark
+      - name: azure-spring-data-cosmos
+        groupId: com.azure

sdk/cosmos/tests.yml

@@ -13,7 +13,7 @@ stages:
           SubscriptionConfigurations:
             - $(sub-config-azure-cloud-test-resources)
             - $(sub-config-cosmos-azure-cloud-test-resources)
-      Clouds: 'Cosmos_Public'
+      Clouds: 'Cosmos_Public_Integration'
       MatrixConfigs:
         - Name: Cosmos_live_test
           Path: sdk/cosmos/platform-matrix.json
@@ -39,7 +39,7 @@ stages:
 
   - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
-      TestName: 'Integration'
+      TestName: 'Spring_Data_Cosmos_Integration'
       CloudConfig:
         Public:
           SubscriptionConfigurations:
@@ -52,9 +52,9 @@ stages:
           GenerateVMJobs: true
       ServiceDirectory: spring
       Artifacts:
-        - name: azure-spring-data-cosmos-test
+        - name: azure-spring-data-cosmos
           groupId: com.azure
-          safeName: azurespringdatacosmostest
+          safeName: azurespringdatacosmos
       TimeoutInMinutes: 90
       PreSteps:
         - template: /eng/pipelines/templates/steps/install-reporting-tools.yml