Skip to content

Commit

Permalink
Merging Key Vault's latest minor release into master (#14047)
Browse files Browse the repository at this point in the history
* Removed classes and changes not to be included in the next minor release.

* Re-recorded tests for service version 7.1

* Removed checkstyle suppression for a feature that won't be released this time around.

* Updated Storage tests that depend on Key Vault and re-recorded them.

* Update Key Vault versions for minor release (August 2020) (#14023)

* Bumped versions.

* Updated CHANGELOG and README files.

* Updated KV Keys test dependency on Storage Blob Cryptography that was breaking "from source" build.

* Fixed issue with build pipelines.

* Fixed Java 9+ module exports issue with Keys and Certificates.

* Increment version for keyvault releases (#14039)

* Increment package version after release of com.azure azure-security-keyvault-secrets

* Increment package version after release of com.azure azure-security-keyvault-certificates

* Increment package version after release of com.azure azure-security-keyvault-keys

* Updated version_client.txt to use the source (unreleased) version of azure-security-keyvault-keys.

* Updated CHANGELOG files to be like master but including the latest minor release.

* Removed changes that are not compatible with the local cryptography clients from master.

* Added back local cryptography classes ahead of merge with master. Added back storage test class that depends on it as well.

Co-authored-by: Azure SDK Bot <[email protected]>
  • Loading branch information
vcolin7 and azure-sdk authored Aug 13, 2020
1 parent eb68505 commit b0a445a
Show file tree
Hide file tree
Showing 131 changed files with 31,051 additions and 16,027 deletions.
6 changes: 3 additions & 3 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,17 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.1.0-beta.5</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
<version>4.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
<version>4.2.0-beta.6</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->
<version>4.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.2.0-beta.5</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
<version>4.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
8 changes: 4 additions & 4 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ com.azure:azure-messaging-eventhubs;5.1.2;5.2.0-beta.1
com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.1.2;1.2.0-beta.2
com.azure:azure-messaging-servicebus;7.0.0-beta.5;7.0.0-beta.6
com.azure:azure-search-documents;11.0.0;11.1.0-beta.2
com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.5
com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.6
com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.5
com.azure:azure-security-keyvault-certificates;4.1.0;4.2.0-beta.1
com.azure:azure-security-keyvault-keys;4.2.0;4.3.0-beta.1
com.azure:azure-security-keyvault-secrets;4.2.0;4.3.0-beta.1
com.azure:azure-sdk-template;1.1.0;1.2.0-beta.1
com.azure:azure-spring-data-cosmos-core;3.0.0-beta.1;3.0.0-beta.1
com.azure:azure-spring-data-2-2-cosmos;3.0.0-beta.1;3.0.0-beta.1
Expand Down Expand Up @@ -119,7 +119,7 @@ com.microsoft.azure:spring-data-cosmosdb;3.0.0-beta.1;3.0.0-beta.1
# unreleased_<groupId>:<artifactId>;dependency-version
# note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
unreleased_com.azure:azure-messaging-servicebus;7.0.0-beta.5
unreleased_com.azure:azure-security-keyvault-keys;4.2.0-beta.6
unreleased_com.azure:azure-security-keyvault-keys;4.3.0-beta.1

# Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
# version and set the version to the released beta. Released beta dependencies are only valid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.1.4</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
<version>4.2.0</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
6 changes: 3 additions & 3 deletions sdk/e2e/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
<version>4.2.0-beta.6</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->
<version>4.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.2.0-beta.5</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
<version>4.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.1.0-beta.5</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
<version>4.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Release History

## 4.1.0-beta.5 (Unreleased)
## 4.2.0-beta.1 (Unreleased)


## 4.1.0 (2020-08-12)
- Added support for service version `7.1`.
- Added `retryPolicy` setter in `CertificateClientBuilder`.
- Added `recoverableDays` property to `CertificateProperties`.

## 4.1.0-beta.4 (2020-07-08)
- Updated versions for azure-core, azure-identity.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Maven dependency for the Azure Key Vault Certificate client library. Add it to y
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.0.5</version>
<version>4.1.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-certificates/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.1.0-beta.5</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
<version>4.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->

<name>Microsoft Azure client library for KeyVault Certificates</name>
<description>This module contains client library for Microsoft Azure KeyVault Certificates.</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
public enum CertificateServiceVersion implements ServiceVersion {
V7_0("7.0"),
V7_1_PREVIEW("7.1-preview");
V7_1("7.1");

private final String version;

Expand All @@ -32,6 +32,6 @@ public String getVersion() {
* @return the latest {@link CertificateServiceVersion}
*/
public static CertificateServiceVersion getLatest() {
return V7_1_PREVIEW;
return V7_1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
module com.azure.security.keyvault.certificates {
requires transitive com.azure.core;

exports com.azure.security.keyvault.certificates;
exports com.azure.security.keyvault.certificates.models;

opens com.azure.security.keyvault.certificates to com.fasterxml.jackson.databind;
Expand Down
Loading

0 comments on commit b0a445a

Please sign in to comment.