Merge pull request #99 from jofriedm-msft/dev

Dev

Author: jofriedm-msft

ChangeLog.txt

@@ -1,4 +1,4 @@
-2017.XX.XX Version X.X.X
+2017.11.01 Version 6.1.0
  * Added support for the last time the tier was modified.
 
 2017.10.06 Version 6.0.0

README.md

@@ -30,7 +30,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>6.0.0</version>
+	<version>6.1.0</version>
 </dependency>
 ```
 

microsoft-azure-storage-samples/pom.xml

@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>6.0.0</version>
+			<version>6.1.0</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>6.0.0</version>
+            <version>6.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>

microsoft-azure-storage-test/src/com/microsoft/azure/storage/AccountSasTests.java

@@ -208,14 +208,6 @@ public void testBlobIPAccountSas() throws InvalidKeyException, StorageException,
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-
-            sourceIP = new IPRange(lastWord);
         }
         finally {
             this.blobContainer.deleteIfExists();
@@ -340,14 +332,6 @@ public void testFileIPAccountSas() throws InvalidKeyException, StorageException,
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-
-            sourceIP = new IPRange(lastWord);
         }
         finally {
             this.fileShare.deleteIfExists();
@@ -474,14 +458,6 @@ public void testQueueIPAccountSas()
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-
-            sourceIP = new IPRange(lastWord);
         }
         finally {
             this.queueQueue.deleteIfExists();
@@ -608,14 +584,6 @@ public void testTableIPAccountSas() throws InvalidKeyException, StorageException
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-
-            sourceIP = new IPRange(lastWord);
         }
         finally {
             this.tableTable.deleteIfExists();

microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/SasTests.java

@@ -137,14 +137,6 @@ public void testIpAcl()
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-            
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-            
-            sourceIP = new IPRange(lastWord);
         }
 
         // Ensure access attempt from the single allowed IP succeeds

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/FileSasTests.java

@@ -181,14 +181,6 @@ public void testIpAcl()
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-            
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-            
-            sourceIP = new IPRange(lastWord);
         }
 
         // Ensure access attempt from the single allowed IP succeeds

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

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

pom.xml

@@ -10,7 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage</artifactId>
-	<version>6.0.0</version>
+	<version>6.1.0</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft Azure Storage Client SDK</name>