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

Updating AAP jar version for signed jar and moving it to azure dev-ops feed from blob storage #22046

Merged
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
4 changes: 2 additions & 2 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ test_jar_com.microsoft.azure:azure-mgmt-resources;1.3.1-SNAPSHOT
# everything under sdk\cosmos
cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.12.2
cosmos_com.google.guava:guava;25.0-jre
cosmos_com.microsoft.data.encryption:cryptography;0.2.1.jre8-preview
cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;0.2.1.jre8-preview
cosmos_com.microsoft.data.encryption:cryptography;0.2.2.jre8-preview
cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;0.2.2.jre8-preview
cosmos_io.dropwizard.metrics:metrics-core;4.1.0
cosmos_io.dropwizard.metrics:metrics-graphite;4.1.0
cosmos_io.dropwizard.metrics:metrics-jvm;4.1.0
Expand Down
15 changes: 4 additions & 11 deletions sdk/cosmos/azure-cosmos-encryption/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ Licensed under the MIT License.
<tag>HEAD</tag>
</scm>

<repositories>
<repository>
<id>azuresdkmaven</id>
<url>https://azsdkartifacts.blob.core.windows.net/maven</url>
</repository>
</repositories>

<!-- CosmosSkip - Needed temporary values to 10% not fail. -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -185,12 +178,12 @@ Licensed under the MIT License.
<dependency>
<groupId>com.microsoft.data.encryption</groupId>
<artifactId>cryptography</artifactId>
<version>0.2.1.jre8-preview</version> <!-- {x-version-update;cosmos_com.microsoft.data.encryption:cryptography;external_dependency} -->
<version>0.2.2.jre8-preview</version> <!-- {x-version-update;cosmos_com.microsoft.data.encryption:cryptography;external_dependency} -->
</dependency>
<dependency>
<groupId>com.microsoft.data.encryption</groupId>
<artifactId>azure-key-vault-keystoreprovider</artifactId>
<version>0.2.1.jre8-preview</version> <!-- {x-version-update;cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;external_dependency} -->
<version>0.2.2.jre8-preview</version> <!-- {x-version-update;cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;external_dependency} -->
<exclusions>
<exclusion>
<groupId>com.microsoft.data.encryption</groupId>
Expand Down Expand Up @@ -252,8 +245,8 @@ Licensed under the MIT License.
<includes>
<include>com.azure:*</include>
<include>org.bouncycastle:bcprov-jdk15on:[1.68]</include> <!-- {x-include-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
<include>com.microsoft.data.encryption:cryptography:[0.2.1.jre8-preview]</include> <!-- {x-include-update;cosmos_com.microsoft.data.encryption:cryptography;external_dependency} -->
<include>com.microsoft.data.encryption:azure-key-vault-keystoreprovider:[0.2.1.jre8-preview]</include> <!-- {x-include-update;cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;external_dependency} -->
<include>com.microsoft.data.encryption:cryptography:[0.2.2.jre8-preview]</include> <!-- {x-include-update;cosmos_com.microsoft.data.encryption:cryptography;external_dependency} -->
<include>com.microsoft.data.encryption:azure-key-vault-keystoreprovider:[0.2.2.jre8-preview]</include> <!-- {x-include-update;cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down