Azure · saragluna · Jun 25, 2020 · May 28, 2020 · Jun 9, 2020 · Jun 11, 2020
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -17,6 +17,7 @@
 /sdk/core/                                          @alzimmermsft @jianghaolu @srnagar @hemanttanwar @anuchandy
 /sdk/core/azure-core-tracing-opentelemetry/         @samvaity @alzimmermsft
 /sdk/cosmos/                                        @moderakh @kushagraThapar @David-Noble-at-work @kirankumarkolli @mbhaskar
+/sdk/cosmos/azure-spring-data-cosmosdb/             @kushagraThapar
 /sdk/eventhubs/                                     @conniey @srnagar @mssfang
 /sdk/formrecognizer/                                @samvaity @mssfang @sima-zhu
 /sdk/identity/                                      @schaabs @g2vinay @jianghaolu

diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -457,11 +457,20 @@
   <!-- The variables are assigned by jcommander annotation injection framework, cannot be made final. -->
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck"
             files="com.azure.perf.test.core.PerfStressOptions.java"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck"
+            files="com.microsoft.azure.spring.data.cosmosdb.config.AbstractCosmosConfiguration.java"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck"
+            files="com.microsoft.azure.spring.data.cosmosdb.core.query.CosmosPageRequest.java"/>
 
   <!-- Checkstyle suppressions for azure-test-watch package -->
   <suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck" files="com.azure.testing.AzureTestWatcher.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.GoodLoggingCheck" files="com.azure.testing.AzureTestWatcher.java"/>
 
   <!-- Checkstyle suppressions for resource manager package -->
   <suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck" files="com.azure.resourcemanager.*"/>
+  <!-- Checkstyle suppressions for spring-data-cosmosdb package -->
+  <suppress checks="com.azure.tools.checkstyle.checks.GoodLoggingCheck|ExternalDependencyExposedCheck|ThrowFromClientLoggerCheck" files="com.microsoft.azure.spring.data.cosmosdb.*\.java"/>
+  <suppress checks="MethodName|MemberName|ParameterName|VisibilityModifier" files="com.microsoft.azure.spring.data.cosmosdb.domain|repository|config.*\.java"/>
+  <suppress checks="ConstantName" files="com.microsoft.azure.spring.data.cosmosdb.repository|common.*\.java" />
+
 </suppressions>
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -243,6 +243,11 @@
       <artifactId>azure-data-gremlin-spring-boot-starter</artifactId>
       <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>2.3.1-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-data-cosmosdb;current} -->
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt
@@ -4,7 +4,9 @@ com.fasterxml.jackson.core:jackson-annotations;2.10.1
 com.fasterxml.jackson.core:jackson-core;2.10.1
 com.fasterxml.jackson.core:jackson-databind;2.10.1
 com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.10.1
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.10.0
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.10.1
+com.fasterxml.jackson.module:jackson-module-parameter-names;2.10.0
 com.github.spotbugs:spotbugs;4.0.0-beta3
 com.github.spotbugs:spotbugs-maven-plugin;3.1.12.2
 com.google.code.gson:gson;2.8.5
@@ -15,15 +17,15 @@ com.microsoft.azure:azure-arm-client-runtime;1.7.3
 com.microsoft.azure:azure-client-authentication;1.7.3
 com.microsoft.azure:azure-client-runtime;1.7.3
 com.microsoft.azure:azure-core;0.9.8
-com.microsoft.azure:azure-cosmos;3.7.1
+com.microsoft.azure:azure-cosmos;3.7.3
 com.microsoft.azure:azure-keyvault-cryptography;1.2.2
 com.microsoft.azure:azure-media;0.9.8
 com.microsoft.azure:azure-servicebus-jms;0.0.2
 com.microsoft.azure:qpid-proton-j-extensions;1.2.3
-com.microsoft.azure:spring-data-cosmosdb;2.2.3.FIX1
 com.microsoft.rest:client-runtime;1.7.4
 com.microsoft.rest.v2:client-runtime;2.1.1
 com.microsoft.spring.data.gremlin:spring-data-gremlin;2.2.3
+com.microsoft.azure:spring-data-cosmosdb;2.3.0
 com.squareup.okhttp3:okhttp;4.2.2
 commons-codec:commons-codec;1.13
 io.micrometer:micrometer-core;1.2.0
@@ -45,6 +47,7 @@ javax.annotation:javax.annotation-api;1.3.2
 javax.servlet:javax.servlet-api;4.0.1
 javax.validation:validation-api;2.0.1.Final
 net.minidev:json-smart;2.3
+org.apache.ant:ant;1.9.4
 org.apache.avro:avro;1.9.2
 org.apache.httpcomponents:httpclient;4.3.6
 org.apache.logging.log4j:log4j-api;2.11.1
@@ -55,6 +58,8 @@ org.asynchttpclient:async-http-client;2.10.5
 org.codehaus.groovy:groovy-eclipse-batch;2.5.8-01
 org.codehaus.groovy:groovy-eclipse-compiler;3.4.0-01
 org.hibernate.validator:hibernate-validator;6.0.17.Final
+org.javatuples:javatuples;1.2
+org.json:json;20140107
 org.linguafranca.pwdb:KeePassJava2;2.1.4
 org.powermock:powermock-api-mockito2;2.0.2
 org.powermock:powermock-module-junit4;2.0.2
@@ -82,6 +87,11 @@ org.springframework.security:spring-security-oauth2-core;5.3.2.RELEASE
 org.springframework.security:spring-security-oauth2-jose;5.3.2.RELEASE
 org.springframework:spring-web;5.2.6.RELEASE
 org.springframework:spring-jms;5.2.6.RELEASE
+org.springframework.data:spring-data-commons;2.3.0.RELEASE
+org.springframework:spring-beans;5.2.6.RELEASE
+org.springframework:spring-core;5.2.6.RELEASE
+org.springframework:spring-expression;5.2.6.RELEASE
+org.springframework:spring-tx;5.2.6.RELEASE
 pl.pragmatists:JUnitParams;1.1.1
 
 ## Test dependency versions
@@ -183,7 +193,9 @@ org.apache.maven.plugins:maven-source-plugin;3.0.1
 org.apache.maven.plugins:maven-surefire-plugin;3.0.0-M3
 org.apidesign.javadoc:codesnippet-doclet;0.53
 org.codehaus.mojo:build-helper-maven-plugin;3.0.0
+org.codehaus.mojo:cobertura-maven-plugin;2.7
 org.codehaus.mojo:exec-maven-plugin;1.2.1
+org.codehaus.mojo:findbugs-maven-plugin;3.0.5
 org.codehaus.mojo:properties-maven-plugin;1.0.0
 org.codehaus.mojo:xml-maven-plugin;1.0
 org.eclipse.jetty:jetty-maven-plugin;9.3.22.v20171030
@@ -254,3 +266,4 @@ storage_com.microsoft.azure:azure-storage;8.4.0
 spring_io.micrometer:micrometer-core;1.3.0
 spring_io.micrometer:micrometer-registry-azure-monitor;1.3.0
 spring_com.microsoft.azure:azure;1.34.0
+
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -55,7 +55,7 @@ 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;2.3.0;2.3.1-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-cosmosdb/CHANGELOG.md b/sdk/cosmos/azure-spring-data-cosmosdb/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Release History
+
+## 2.3.1-beta.1 (Unreleased)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Release History

		## 2.3.1-beta.1 (Unreleased)