Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update keyvault patch release september 2020 #15017

Merged
merged 2 commits into from
Sep 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,17 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
<version>4.1.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.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->
<version>4.2.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.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
<version>4.2.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 @@ -37,9 +37,9 @@ com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.1.2;1.2.0-beta.3
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
com.azure:azure-search-perf;1.0.0-beta.1;1.0.0-beta.1
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-security-keyvault-certificates;4.1.0;4.1.1
com.azure:azure-security-keyvault-keys;4.2.0;4.2.1
com.azure:azure-security-keyvault-secrets;4.2.0;4.2.1
com.azure:azure-sdk-template;1.2.1-beta.2;1.2.1-beta.3
com.azure:azure-spring-data-cosmos-core;3.0.0-beta.1;3.0.0-beta.2
com.azure:azure-spring-data-2-2-cosmos;3.0.0-beta.1;3.0.0-beta.2
Expand Down Expand Up @@ -131,7 +131,7 @@ com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder;1.2.8-beta.1;1.2.
# note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
unreleased_com.azure:azure-core-amqp;1.5.0-beta.1
unreleased_com.azure:azure-messaging-servicebus;7.0.0-beta.5
unreleased_com.azure:azure-security-keyvault-keys;4.3.0-beta.1
unreleased_com.azure:azure-security-keyvault-keys;4.2.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
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos-encryption/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Licensed under the MIT License.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
<version>4.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->
<version>4.2.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kushagraThapar could you confirm if this needs to be a current dependency or dependency version should work?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just for the from source pipeline to work. This change won't go into master.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as long as cosmos Encryption_Integration_Tests_Java8 test pass we are fine

</dependency>

<dependency>
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.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->
<version>4.2.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.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
<version>4.2.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.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
<version>4.1.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,7 +1,7 @@
# Release History

## 4.2.0-beta.1 (Unreleased)

## 4.1.1 (2020-09-10)
- Updated versions for azure-core and azure-identity.

## 4.1.0 (2020-08-12)
- Added support for service version `7.1`.
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.1.0</version>
<version>4.1.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
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.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
<version>4.1.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
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Release History

## 4.3.0-beta.1 (Unreleased)

## 4.2.1 (2020-09-10)
- Updated versions for azure-core and azure-identity.

## 4.2.0 (2020-08-12)
- Added support for service version `7.1`.
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-keys/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Maven dependency for the Azure Key Vault Key client library. Add it to your proj
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
<version>4.2.0</version>
<version>4.2.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-keys/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
<version>4.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->
<version>4.2.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-keys;current} -->

<name>Microsoft Azure client library for KeyVault Keys</name>
<description>This module contains client library for Microsoft Azure KeyVault Keys.</description>
Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Release History

## 4.3.0-beta.1 (Unreleased)

## 4.2.1 (2020-09-10)
- Updated versions for azure-core and azure-identity.

## 4.2.0 (2020-08-12)
- Added support for service version `7.1`.
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-secrets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Maven dependency for the Azure Key Vault Secrets client library. Add it to your
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.2.0</version>
<version>4.2.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-secrets/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
<version>4.2.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->

<name>Microsoft Azure client library for KeyVault Secrets</name>
<description>This module contains client library for Microsoft Azure KeyVault Secrets.</description>
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-cryptography/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
<version>4.3.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure:azure-security-keyvault-keys;dependency} -->
<version>4.2.1</version> <!-- {x-version-update;unreleased_com.azure:azure-security-keyvault-keys;dependency} -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcolin7 Could you confirm if we are releasing key beta with 4.3.0-beta.1 if yes, then we should not change this.

Copy link
Member Author

@vcolin7 vcolin7 Sep 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is for doing a patch release for our GA'ed library, the preview will be released from master.

<scope>test</scope>
</dependency>
</dependencies>
Expand Down