android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-07-31 05:04:26 +03:00
Code Releases Activity

Avoid hard conscrypt dep (#4128)

Browse Source
This commit is contained in:
Yuri Schimke
2018-07-11 07:00:22 +01:00
committed by GitHub
parent 67f786d984
commit 00def7aecf
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
okhttp-dnsoverhttps/pom.xml
View File

@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>org.conscrypt</groupId> <groupId>org.conscrypt</groupId>
<artifactId>conscrypt-openjdk-uber</artifactId> <artifactId>conscrypt-openjdk-uber</artifactId>
<version>1.1.0</version> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

1
okhttp-tests/pom.xml
View File

@ -47,7 +47,6 @@
<dependency> <dependency>
<groupId>org.conscrypt</groupId> <groupId>org.conscrypt</groupId>
<artifactId>conscrypt-openjdk-uber</artifactId> <artifactId>conscrypt-openjdk-uber</artifactId>
<version>1.0.1</version>
</dependency> </dependency>
<dependency> <dependency>

1
okhttp/pom.xml
View File

@ -20,7 +20,6 @@
<dependency> <dependency>
<groupId>org.conscrypt</groupId> <groupId>org.conscrypt</groupId>
<artifactId>conscrypt-openjdk-uber</artifactId> <artifactId>conscrypt-openjdk-uber</artifactId>
<version>1.1.3</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

7
pom.xml
View File

@ -56,6 +56,7 @@
<moshi.version>1.1.0</moshi.version> <moshi.version>1.1.0</moshi.version>
<jnr-unixsocket.version>0.19</jnr-unixsocket.version> <jnr-unixsocket.version>0.19</jnr-unixsocket.version>
<okio.version>1.14.0</okio.version> <okio.version>1.14.0</okio.version>
<conscrypt.version>1.1.4</conscrypt.version>
<!-- Test Dependencies --> <!-- Test Dependencies -->
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
@ -136,6 +137,11 @@
<artifactId>jnr-unixsocket</artifactId> <artifactId>jnr-unixsocket</artifactId>
<version>${jnr-unixsocket.version}</version> <version>${jnr-unixsocket.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.conscrypt</groupId>
<artifactId>conscrypt-openjdk-uber</artifactId>
<version>${conscrypt.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -353,7 +359,6 @@
<dependency> <dependency>
<groupId>org.conscrypt</groupId> <groupId>org.conscrypt</groupId>
<artifactId>conscrypt-openjdk-uber</artifactId> <artifactId>conscrypt-openjdk-uber</artifactId>
<version>1.1.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>