chore: Tests pass, server runs w/ analytics (#17205)

* Tests pass, server runs w/ analytics

* Fix okhttp
This commit is contained in:
Nidhi 2022-09-30 11:49:25 +05:30 committed by GitHub
parent 54e00b9c5d
commit ca5499c358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 6 deletions

View File

@ -195,11 +195,20 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver3</artifactId>
<version>5.0.0-alpha.10</version>
<version>${mockwebserver.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp3.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>

View File

@ -87,7 +87,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver3</artifactId>
<version>5.0.0-alpha.10</version>
<version>${mockwebserver.version}</version>
<scope>test</scope>
</dependency>
<!-- We need this dependency only to ensure TestContainers work with JUnit5 -->

View File

@ -276,8 +276,21 @@
<dependency>
<groupId>com.segment.analytics.java</groupId>
<artifactId>analytics</artifactId>
<version>2.1.1</version>
<version>3.3.1</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.squareup.okio/okio-jvm -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.sentry</groupId>
<artifactId>sentry-spring-boot-starter</artifactId>
@ -341,8 +354,14 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver3</artifactId>
<version>5.0.0-alpha.10</version>
<version>${mockwebserver.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

View File

@ -28,6 +28,8 @@
<h2.version>2.1.210</h2.version>
<testcontainers.version>1.17.3</testcontainers.version>
<mockito.version>4.4.0</mockito.version>
<mockwebserver.version>5.0.0-alpha.2</mockwebserver.version>
<okhttp3.version>4.10.0</okhttp3.version>
</properties>
<build>