Skip to content

Commit 05ce6ce

Browse files
authored
deps: Add Conscrypt to shared-deps (#13838)
1 parent bc18390 commit 05ce6ce

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

  • sdk-platform-java
    • gapic-generator-java-pom-parent
    • java-shared-dependencies/third-party-dependencies

sdk-platform-java/gapic-generator-java-pom-parent/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<mockito.version>4.11.0</mockito.version>
4242
<awaitility.version>4.3.0</awaitility.version>
4343
<slf4j.version>2.0.16</slf4j.version>
44+
<conscrypt.version>2.6.0</conscrypt.version>
4445
<!-- skipping clirr check for protobuf 4.x upgrade -->
4546
<clirr.skip>true</clirr.skip>
4647
<ignoreNonCompile>true</ignoreNonCompile><!-- maven-dependency-plugin:analyze to skip test scope dependencies -->

sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,11 @@
273273
<artifactId>jspecify</artifactId>
274274
<version>${jspecify.version}</version>
275275
</dependency>
276+
<dependency>
277+
<groupId>org.conscrypt</groupId>
278+
<artifactId>conscrypt-openjdk</artifactId>
279+
<version>${conscrypt.version}</version>
280+
</dependency>
276281
<dependency>
277282
<groupId>org.awaitility</groupId>
278283
<artifactId>awaitility</artifactId>

0 commit comments

Comments
 (0)