Skip to content
This repository was archived by the owner on Jul 19, 2024. It is now read-only.

Commit 715496a

Browse files
authored
Merge pull request #392 from Azure/dev
Dev
2 parents 5c11555 + 988fd70 commit 715496a

File tree

77 files changed

+4924
-2319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+4924
-2319
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ The Azure Storage development team uses Intellij. However, any preferred IDE or
2020
## Tests
2121

2222
### Configuration
23-
The only step to configure testing is to set the appropriate environment variable. Create environment variables named "ACCOUNT_NAME", "ACCOUNT_KEY", "SECONDARY_ACCOUNT_NAME", and "SECONDARY_ACCOUNT_KEY". The first two will be used for most requests. The second two will only be used for tests requiring two accounts.
23+
The only step to configure testing is to set the appropriate environment variables. Create environment variables named "ACCOUNT_NAME" and "ACCOUNT_KEY", holding your Azure storage account name and key respectively. This will satisfy most tests.
24+
To run any tests requiring two accounts (generally those testing copy-related apis), set environment variables "SECONDARY_ACCOUNT_NAME", and "SECONDARY_ACCOUNT_KEY".
25+
To run any tests related to setting blob tiers on block blobs, set environment variables "BLOB_STORAGE_ACCOUNT_NAME" and "BLOB_STORAGE_ACCOUNT_KEY". Note that a GPV2 account is also sufficient here.
26+
To run any tests related to setting blob tiers on page blobs, set environment variables "PREMIUM_ACCOUNT_NAME" and "PREMIUM_ACCOUNT_KEY".
27+
It is valid to use a single account for multiple scenarios; a GPV2 account would work for both the primary account and the blob storage account, for instance. The only restriction is that the primary and secondary accounts must be distinct.
2428

2529
### Running
2630
To actually run tests, right click on the test class in the Package Explorer or the individual test in the Outline and select Run As->GroovyTest. Alternatively, run mvn test from the command line.

ChangeLog.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2018.10.29 Version 10.2.0
2+
* Added overloads which only accept the required parameters.
3+
* Added CopyFromURL, which will do a synchronous server-side copy, meaning the service will not return an HTTP response until it has completed the copy.
4+
* Added support for IProgressReceiver in TransferManager operations. This parameter was previously ignored but is now supported.
5+
* Removed internal dependency on javafx to be compatible with openjdk.
6+
* Fixed a bug that would cause downloading large files with the TransferManager to fail.
7+
* Fixed a bug in BlobURL.download() logic for setting up reliable download. This had the potential to download the wrong range when a download stream was retried.
8+
19
2018.09.11 Version 10.1.0
210
* Interfaces for helper types updated to be more consistent throughout the library. All types, with the exception of the options for pipeline factories, use a fluent pattern.
311
* Removed RetryReader type as it's functionality was moved to be built into the DownloadResponse. RetryReaderOptions are now named ReliableDownloadOptions.

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ To get the binaries of this library as distributed by Microsoft, ready for use w
3131
<dependency>
3232
<groupId>com.microsoft.azure</groupId>
3333
<artifactId>azure-storage-blob</artifactId>
34-
<version>10.1.0</version>
34+
<version>10.2.0</version>
3535
</dependency>
3636
```
3737

@@ -41,12 +41,11 @@ To get the source code of the SDK via git just type:
4141

4242
git clone git://github.com/Azure/azure-storage-java.git
4343
cd ./azure-storage-java
44-
git checkout New-Storage-SDK-V10-Preview
4544
mvn compile
4645

4746
### Option 3: Source Zip
4847

49-
To download a copy of the source code, use the drop down menu on the left to select the branch New-Storage-SDK-V10-Preview and click "Download ZIP" on the right side of the page or click [here](https://github.com/Azure/azure-storage-java/archive/master.zip). Unzip and navigate to the microsoft-azure-storage folder.
48+
To download a copy of the source code, click "Download ZIP" on the right side of the page or click [here](https://github.com/Azure/azure-storage-java/archive/master.zip). Unzip and navigate to the microsoft-azure-storage folder.
5049

5150
## Minimum Requirements
5251

pom.xml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<groupId>com.microsoft.azure</groupId>
1616
<artifactId>azure-storage-blob</artifactId>
17-
<version>10.1.0</version>
17+
<version>10.2.0</version>
1818

1919
<name>Azure Storage Blob</name>
2020
<description>The Azure Storage Java Blob library.</description>
@@ -61,19 +61,6 @@
6161
</pluginRepository>
6262
</pluginRepositories>
6363

64-
<repositories>
65-
<repository>
66-
<id>ossrh</id>
67-
<name>Sonatype Snapshots</name>
68-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
69-
<layout>default</layout>
70-
<snapshots>
71-
<enabled>true</enabled>
72-
<updatePolicy>always</updatePolicy>
73-
</snapshots>
74-
</repository>
75-
</repositories>
76-
7764
<dependencies>
7865
<dependency>
7966
<groupId>com.microsoft.rest.v2</groupId>
@@ -113,6 +100,7 @@
113100
</dependencies>
114101

115102
<build>
103+
<sourceDirectory>src/main/java</sourceDirectory>
116104
<testSourceDirectory>src/test/java</testSourceDirectory>
117105

118106
<plugins>
@@ -145,6 +133,7 @@
145133
<artifactId>maven-surefire-plugin</artifactId>
146134
<version>2.20.1</version>
147135
<configuration>
136+
<useFile>false</useFile>
148137
<includes>
149138
<include>**/Test*.*</include>
150139
<include>**/*Test.*</include>
@@ -187,6 +176,7 @@
187176
<plugin>
188177
<groupId>org.codehaus.mojo</groupId>
189178
<artifactId>build-helper-maven-plugin</artifactId>
179+
<version>3.0.0</version>
190180
</plugin>
191181
</plugins>
192182
</build>

0 commit comments

Comments
 (0)