Skip to content

Commit 92abffc

Browse files
connieyconniey
authored
Upgrade dependency version of bouncycastle and fix broken link. (Azure#18454)
* Update versions of bouncycastle. * Update mediaservice/pom.xml to have coverage profile.
1 parent ee73f1e commit 92abffc

File tree

7 files changed

+58
-14
lines changed

7 files changed

+58
-14
lines changed

‎eng/versioning/external_dependencies.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ org.apache.maven:maven-embedder;3.6.2
176176
org.apache.maven.wagon:wagon-http;3.3.4
177177
org.apache.maven.wagon:wagon-provider-api;3.3.4
178178
org.assertj:assertj-core;3.16.1
179-
org.bouncycastle:bcprov-jdk15on;1.66
179+
org.bouncycastle:bcprov-jdk15on;1.68
180180
org.eclipse.aether:aether-connector-basic;1.1.0
181181
org.eclipse.aether:aether-transport-wagon;1.1.0
182182
org.eclipse.jetty:jetty-http;9.4.33.v20201020

‎sdk/cosmos/azure-cosmos-encryption/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Licensed under the MIT License.
151151
<dependency>
152152
<groupId>org.bouncycastle</groupId>
153153
<artifactId>bcprov-jdk15on</artifactId>
154-
<version>1.66</version> <!-- {x-version-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
154+
<version>1.68</version> <!-- {x-version-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
155155
</dependency>
156156

157157

@@ -209,7 +209,7 @@ Licensed under the MIT License.
209209
<bannedDependencies>
210210
<includes>
211211
<include>com.azure:*</include>
212-
<include>org.bouncycastle:bcprov-jdk15on:[1.66]</include> <!-- {x-include-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
212+
<include>org.bouncycastle:bcprov-jdk15on:[1.68]</include> <!-- {x-include-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
213213
</includes>
214214
</bannedDependencies>
215215
</rules>

‎sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Open a command prompt/terminal:
5050

5151
## Building only the Azure SDK client library for Storage Blob Checkpoint Store
5252

53-
After building the tooling and solution once from the section,
53+
After building the tooling and solution once from the section,
5454
[Building all the client libraries](#building-all-the-client-libraries), you can build just the Azure SDK client library
5555
for Checkpoint store using Storage Blobs by executing:
5656
1. `mvn compile -f sdk\eventhubs\azure-messaging-eventhubs-checkpointstore-blob\pom.xml`

‎sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>org.bouncycastle</groupId>
9292
<artifactId>bcprov-jdk15on</artifactId>
93-
<version>1.66</version> <!-- {x-version-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
93+
<version>1.68</version> <!-- {x-version-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
9494
<scope>test</scope>
9595
</dependency>
9696
</dependencies>

‎sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<dependency>
124124
<groupId>org.bouncycastle</groupId>
125125
<artifactId>bcprov-jdk15on</artifactId>
126-
<version>1.66</version> <!-- {x-version-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
126+
<version>1.68</version> <!-- {x-version-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
127127
<scope>test</scope>
128128
</dependency>
129129
<dependency>

‎sdk/mediaservices/microsoft-azure-media/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<dependency>
148148
<groupId>org.bouncycastle</groupId>
149149
<artifactId>bcprov-jdk15on</artifactId>
150-
<version>1.66</version> <!-- {x-version-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
150+
<version>1.68</version> <!-- {x-version-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
151151
<scope>test</scope>
152152
</dependency>
153153
</dependencies>

‎sdk/mediaservices/pom.xml‎

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,59 @@
11
<!-- Copyright (c) Microsoft Corporation. All rights reserved.
22
Licensed under the MIT License. -->
33
<project xmlns="http://maven.apache.org/POM/4.0.0"
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
65
<modelVersion>4.0.0</modelVersion>
76
<groupId>com.azure</groupId>
87
<artifactId>azure-mediaservices-service</artifactId>
98
<packaging>pom</packaging>
10-
<version>1.0.0</version><!-- Need not change for every release-->
11-
<modules>
12-
<module>azure-resourcemanager-mediaservices</module>
13-
<module>microsoft-azure-media</module>
14-
</modules>
9+
<version>1.0.0</version> <!-- Need not change for every release-->
10+
11+
<profiles>
12+
<profile>
13+
<id>coverage</id>
14+
<modules>
15+
<module>azure-resourcemanager-mediaservices</module>
16+
</modules>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>com.azure.resourcemanager</groupId>
21+
<artifactId>azure-resourcemanager-mediaservices</artifactId>
22+
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-mediaservices;current} -->
23+
</dependency>
24+
</dependencies>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.jacoco</groupId>
30+
<artifactId>jacoco-maven-plugin</artifactId>
31+
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
32+
<executions>
33+
<execution>
34+
<id>report-aggregate</id>
35+
<phase>verify</phase>
36+
<goals>
37+
<goal>report-aggregate</goal>
38+
</goals>
39+
<configuration>
40+
<outputDirectory>${project.reporting.outputDirectory}/test-coverage</outputDirectory>
41+
</configuration>
42+
</execution>
43+
</executions>
44+
</plugin>
45+
</plugins>
46+
</build>
47+
</profile>
48+
<profile>
49+
<id>default</id>
50+
<activation>
51+
<activeByDefault>true</activeByDefault>
52+
</activation>
53+
<modules>
54+
<module>azure-resourcemanager-mediaservices</module>
55+
<module>microsoft-azure-media</module>
56+
</modules>
57+
</profile>
58+
</profiles>
1559
</project>

0 commit comments

Comments
 (0)