Updated versions to 3.7.1 for cosmos (#9477)

* Updated versions to 3.7.1 for cosmos * Updated changelog and readme with version update * updated changelog * Updated macOS machine version
Azure · Mar 25, 2020 · 26ac25e · 26ac25e
1 parent 72d66ac
commit 26ac25e
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 16 deletions.
diff --git a/eng/pipelines/client.yml b/eng/pipelines/client.yml
@@ -169,7 +169,7 @@ jobs:
           JavaVersion: '1.8'
         macOS - Java 8:
           OSName: 'macOS'
-          OSVmImage: 'macOS-10.13'
+          OSVmImage: 'macOS-10.15'
           JavaVersion: '1.8'
         Windows - Java 8:
           OSName: 'Windows'
@@ -181,7 +181,7 @@ jobs:
           JavaVersion: '1.11'
         macOS - Java 11:
           OSName: 'macOS'
-          OSVmImage: 'macOS-10.13'
+          OSVmImage: 'macOS-10.15'
           JavaVersion: '1.11'
         Windows - Java 11:
           OSName: 'Windows'

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -12,7 +12,7 @@ parameters:
       RunTitle: 'Linux on Java 1.8'
     macOS - Java 8:
       OSName: 'macOS'
-      OSVmImage: 'macOS-10.13'
+      OSVmImage: 'macOS-10.15'
       JavaVersion: '1.8'
       RunTitle: 'macOS on Java 1.8'
     Windows - Java 8:
@@ -27,7 +27,7 @@ parameters:
       RunTitle: 'Linux on Java 1.11'
     macOS - Java 11:
       OSName: 'macOS'
-      OSVmImage: 'macOS-10.13'
+      OSVmImage: 'macOS-10.15'
       JavaVersion: '1.11'
       RunTitle: 'macOS on Java 1.11'
     Windows - Java 11:

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-data.yml b/eng/pipelines/templates/jobs/archetype-sdk-data.yml
@@ -12,7 +12,7 @@ parameters:
       RunTitle: 'Linux on Java 1.8'
     macOS - Java 8:
       OSName: 'macOS'
-      OSVmImage: 'macOS-10.13'
+      OSVmImage: 'macOS-10.15'
       JavaVersion: '1.8'
       RunTitle: 'macOS on Java 1.8'
     Windows - Java 8:
@@ -27,7 +27,7 @@ parameters:
       RunTitle: 'Linux on Java 1.11'
     macOS - Java 11:
       OSName: 'macOS'
-      OSVmImage: 'macOS-10.13'
+      OSVmImage: 'macOS-10.15'
       JavaVersion: '1.11'
       RunTitle: 'macOS on Java 1.11'
     Windows - Java 11:

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -10,7 +10,7 @@ parameters:
       DisplayName: 'Linux - Java 8'
     macOS - Java 8:
       OSName: 'macOS'
-      OSVmImage: 'macOS-10.13'
+      OSVmImage: 'macOS-10.15'
       JavaVersion: '1.8'
       DisplayName: 'macOS - Java 8'
     Windows - Java 8:
@@ -25,7 +25,7 @@ parameters:
       DisplayName: 'Linux - Java 11'
     macOS - Java 11:
       OSName: 'macOS'
-      OSVmImage: 'macOS-10.13'
+      OSVmImage: 'macOS-10.15'
       JavaVersion: '1.11'
       DisplayName: 'macOS - Java 11'
     Windows - Java 11:

diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -17,7 +17,7 @@ stages:
             OSName: Windows
             ProfileFlag: '-Punit'
           MacOS - java8:
-            OSVmImage: 'macOS-10.13'
+            OSVmImage: 'macOS-10.15'
             JavaVersion: '1.8'
             OSName: macOS
             ProfileFlag: '-Punit'
@@ -120,4 +120,4 @@ stages:
         Artifacts: ${{parameters.Artifacts}}
         ArtifactName: packages
 
-
+
diff --git a/eng/versioning/version_data.txt b/eng/versioning/version_data.txt
@@ -25,7 +25,7 @@ com.microsoft.azure.cognitiveservices:azure-cognitiveservices-customvision-train
 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-faceapi;1.1.0-beta.1;1.1.0-beta.1
 # azure-cosmos-parent doesn't have a dependency management section anymore, it doesn't need to change unless parent pom changes 
 com.microsoft.azure:azure-cosmos-parent;3.5.0;3.5.0
-com.microsoft.azure:azure-cosmos;3.7.0;3.8.0-beta.1
+com.microsoft.azure:azure-cosmos;3.7.0;3.7.1
 # benchmark and examples aren't released but we're keeping the version in sync with the current cosmos version
 com.microsoft.azure:azure-cosmos-benchmark;3.7.0;3.7.0
 com.microsoft.azure:azure-cosmos-examples;3.7.0;3.7.0

diff --git a/sdk/cosmos/README.md b/sdk/cosmos/README.md
@@ -92,7 +92,7 @@ For example, using maven, you can add the following dependency to your maven pom
 <dependency>
   <groupId>com.microsoft.azure</groupId>
   <artifactId>azure-cosmos</artifactId>
-  <version>3.7.0</version>
+  <version>3.7.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/cosmos/changelog/README.md b/sdk/cosmos/changelog/README.md
@@ -1,4 +1,7 @@
 ## Changelog
+### 3.7.1
+- Fix netty ByteBuf memory leak, issue (https://github.com/Azure/azure-sdk-for-java/issues/9023), PR (https://github.com/Azure/azure-sdk-for-java/pull/9211)
+
 ### 3.7.0
 - Downgrade guava dependency to 25.0-jre from 27.0.1-jre
 - Fix FeedOptions bug (see https://github.com/Azure/azure-sdk-for-java/pull/8085)

diff --git a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml
@@ -33,7 +33,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>3.8.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
+      <version>3.7.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>

diff --git a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml
@@ -94,7 +94,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>3.8.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
+      <version>3.7.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>

diff --git a/sdk/cosmos/microsoft-azure-cosmos/pom.xml b/sdk/cosmos/microsoft-azure-cosmos/pom.xml
@@ -12,7 +12,7 @@ Licensed under the MIT License.
 
   <groupId>com.microsoft.azure</groupId>
   <artifactId>azure-cosmos</artifactId>
-  <version>3.8.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
+  <version>3.7.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
   <name>Microsoft Azure SDK for SQL API of Azure Cosmos DB Service</name>
   <description>This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension rx support) for Azure Cosmos DB SQL API</description>
   <packaging>jar</packaging>

diff --git a/...os/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java b/...os/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java
@@ -258,7 +258,7 @@ public static class Versions {
         // @see
         // https://stackoverflow.com/questions/2469922/generate-a-version-java-file-in-maven
         // {x-version-update-start;com.microsoft.azure:azure-cosmos;current}
-        public static final String SDK_VERSION = "3.8.0-beta.1";
+        public static final String SDK_VERSION = "3.7.1";
         // {x-version-update-end}
         public static final String SDK_NAME = "cosmosdb-java-sdk";
     }