Merge pull request #529 from Azure/legacy-dev

Legacy dev

Author: rickle-msft

ChangeLog.txt

@@ -1,4 +1,4 @@
-XXXX.XX.XX Version X.X.X
+2020.03.10 Version 8.6.1
  * Fixed a bug in BlobInputStream that would return extra zeros at the end of the stream if the data was encrypted using client-side encryption.
  * MD5 checks on BlobInputStream are skipped if data being downloaded is also being decrypted via client-side encryption, even if disableMd5Calculation is set to false. Previously this check would always fail as MD5 is calculated on cipher text on upload but was calculated on plaintext on download.
  * Added a workaround to a JDK bug that would ignore connection timeouts on retries, causing hangs in some scenarios. This requires defaulting setting https keep-alive on all sockets. It can be disabled via BlobRequestOptions.

README.md

@@ -39,7 +39,7 @@ To get the binaries of this library as distributed by Microsoft, ready for use w
 <dependency>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage</artifactId>
-	<version>8.6.0</version>
+	<version>8.6.1</version>
 </dependency>
 ```
 

microsoft-azure-storage-samples/pom.xml

@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>8.6.0</version>
+			<version>8.6.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/logging/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-storage</artifactId>
-            <version>8.6.0</version>
+            <version>8.6.1</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>

microsoft-azure-storage/src/com/microsoft/azure/storage/Constants.java

@@ -765,7 +765,7 @@ public static class HeaderConstants {
         /**
          * Specifies the value to use for UserAgent header.
          */
-        public static final String USER_AGENT_VERSION = "8.6.0";
+        public static final String USER_AGENT_VERSION = "8.6.1";
 
         /**
          * The default type for content-type and accept

microsoft-azure-storage/src/com/microsoft/azure/storage/core/KeepAliveSocketFactory.java

@@ -1,5 +1,17 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
+/**
+ * Copyright Microsoft Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 package com.microsoft.azure.storage.core;
 

pom.xml

@@ -10,7 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage</artifactId>
-	<version>8.6.0</version>
+	<version>8.6.1</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft Azure Storage Client SDK</name>
@@ -25,6 +25,27 @@
 		</license>
 	</licenses>
 
+	>
+
+	<distributionManagement>
+		<relocation>
+			<groupId>com.azure</groupId>
+			<message>
+				This library has been replaced by the following new Azure SDKs. You can read about the new Azure SDKs at https://aka.ms/azsdkvalueprop.
+
+				The latest libraries to interact with the Azure Blob Storage service are:
+
+				* https://search.maven.org/artifact/com.azure/azure-storage-blob
+				* https://search.maven.org/artifact/com.azure/azure-storage-blob-cryptography
+				* https://search.maven.org/artifact/com.azure/azure-storage-blob-batch
+				* https://search.maven.org/artifact/com.azure/azure-storage-queue
+				* https://search.maven.org/artifact/com.azure/azure-storage-file-share
+
+				It is recommended that you move to the new package.
+			</message>
+		</relocation>
+	</distributionManagement>
+
 	<scm>
 		<url>scm:git:https://github.com/Azure/azure-storage-java</url>
 		<connection>scm:git:git://github.com/Azure/azure-storage-java.git</connection>