Skip to content

Commit 9011ace

Browse files
authored
Updating External Dependencies (Azure#37351)
* Updating squareup.okhttp3:okhttp dependency * Updating squareup.okhttp3:mockwebserver dependency * Updating squareup.okio:okio-jvm dependency
1 parent 795a3dc commit 9011ace

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

eng/versioning/external_dependencies.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ com.microsoft.rest.v2:client-runtime;2.1.1
4444
com.microsoft.sqlserver:mssql-jdbc;10.2.3.jre8
4545
com.microsoft.azure:spring-data-cosmosdb;2.3.0
4646
com.mysql:mysql-connector-j;8.0.33
47-
com.squareup.okhttp3:mockwebserver;4.10.0
48-
com.squareup.okhttp3:okhttp;4.10.0
47+
com.squareup.okhttp3:mockwebserver;4.12.0
48+
com.squareup.okhttp3:okhttp;4.12.0
4949
commons-codec:commons-codec;1.15
5050
commons-net:commons-net;3.9.0
5151
io.cloudevents:cloudevents-api;2.2.0
@@ -216,7 +216,8 @@ io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;1.31.0-alpha
216216

217217
io.projectreactor:reactor-test;3.4.33
218218
io.github.hakky54:logcaptor;2.9.0
219-
com.squareup.okio:okio;3.5.0
219+
com.squareup.okio:okio;3.6.0
220+
com.squareup.okio:okio-jvm;3.6.0
220221
junit:junit;4.13.2
221222
commons-cli:commons-cli;1.3
222223
org.assertj:assertj-core;3.22.0

sdk/applicationinsights/microsoft-azure-applicationinsights-query/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>com.squareup.okhttp3</groupId>
8282
<artifactId>mockwebserver</artifactId>
83-
<version>4.10.0</version> <!-- {x-version-update;com.squareup.okhttp3:mockwebserver;external_dependency} -->
83+
<version>4.12.0</version> <!-- {x-version-update;com.squareup.okhttp3:mockwebserver;external_dependency} -->
8484
<scope>test</scope>
8585
</dependency>
8686
</dependencies>

sdk/core/azure-core-http-okhttp/pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,16 @@
7474
<version>1.45.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
7575
</dependency>
7676

77+
<dependency>
78+
<groupId>com.squareup.okio</groupId>
79+
<artifactId>okio-jvm</artifactId>
80+
<version>3.6.0</version> <!-- {x-version-update;com.squareup.okio:okio-jvm;external_dependency} -->
81+
</dependency>
82+
7783
<dependency>
7884
<groupId>com.squareup.okhttp3</groupId>
7985
<artifactId>okhttp</artifactId>
80-
<version>4.10.0</version> <!-- {x-version-update;com.squareup.okhttp3:okhttp;external_dependency} -->
86+
<version>4.12.0</version> <!-- {x-version-update;com.squareup.okhttp3:okhttp;external_dependency} -->
8187
</dependency>
8288

8389
<!-- test dependencies on azure-core, because we want to run tests inherited from this module using OkHttp -->
@@ -145,7 +151,8 @@
145151
<rules>
146152
<bannedDependencies>
147153
<includes>
148-
<include>com.squareup.okhttp3:okhttp:[4.10.0]</include> <!-- {x-include-update;com.squareup.okhttp3:okhttp;external_dependency} -->
154+
<include>com.squareup.okhttp3:okhttp:[4.12.0]</include> <!-- {x-include-update;com.squareup.okhttp3:okhttp;external_dependency} -->
155+
<include>com.squareup.okio:okio-jvm:[3.6.0]</include> <!-- {x-include-update;com.squareup.okio:okio-jvm;external_dependency} -->
149156
</includes>
150157
</bannedDependencies>
151158
</rules>

sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<dependency>
182182
<groupId>com.squareup.okio</groupId>
183183
<artifactId>okio</artifactId>
184-
<version>3.5.0</version> <!-- {x-version-update;com.squareup.okio:okio;external_dependency} -->
184+
<version>3.6.0</version> <!-- {x-version-update;com.squareup.okio:okio;external_dependency} -->
185185
<scope>test</scope>
186186
</dependency>
187187
</dependencies>
@@ -205,7 +205,7 @@
205205
<include>com.github.spotbugs:spotbugs-annotations:[4.8.0]</include> <!-- {x-include-update;com.github.spotbugs:spotbugs-annotations;external_dependency} -->
206206
<include>org.awaitility:awaitility:[4.2.0]</include> <!-- {x-include-update;org.awaitility:awaitility;external_dependency} -->
207207
<include>io.github.hakky54:logcaptor:[2.9.0]</include> <!-- {x-include-update;io.github.hakky54:logcaptor;external_dependency} -->
208-
<include>com.squareup.okio:okio:[3.5.0]</include> <!-- {x-include-update;com.squareup.okio:okio;external_dependency} -->
208+
<include>com.squareup.okio:okio:[3.6.0]</include> <!-- {x-include-update;com.squareup.okio:okio;external_dependency} -->
209209
</includes>
210210
</bannedDependencies>
211211
</rules>

0 commit comments

Comments
 (0)