Skip to content

Commit c0f5f72

Browse files
committed
KNOX-3094: Update gson-fire, gson and pin okio to 3.6.0. Resolve dependency convergence for org.jetbrains:annotations.
1 parent 8073f6d commit c0f5f72

File tree

1 file changed

+29
-1
lines changed

1 file changed

+29
-1
lines changed

pom.xml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@
208208
<frontend-maven-plugin.version>1.11.0</frontend-maven-plugin.version>
209209
<gethostname4j.version>1.0.0</gethostname4j.version> <!-- See here: https://github.com/mattsheppard/gethostname4j -->
210210
<glassfish-jaxb.version>2.3.3</glassfish-jaxb.version>
211-
<gson.version>2.8.9</gson.version>
211+
<gson.version>2.10.1</gson.version>
212+
<gsonfire.version>1.9.0</gsonfire.version>
212213
<groovy.version>3.0.7</groovy.version>
213214
<guava.version>28.2-jre</guava.version>
214215
<hadoop.version>3.2.4</hadoop.version>
@@ -263,6 +264,7 @@
263264
<postgresql.version>42.4.4</postgresql.version>
264265
<mysql.version>8.0.28</mysql.version>
265266
<mariadb.connector.version>3.3.0</mariadb.connector.version>
267+
<okio.version>3.6.0</okio.version>
266268
<protobuf.version>3.16.3</protobuf.version>
267269
<powermock.version>2.0.9</powermock.version>
268270
<purejavacomm.version>0.0.11.1</purejavacomm.version>
@@ -1575,6 +1577,32 @@
15751577
<artifactId>okhttp</artifactId>
15761578
<version>${okhttp.version}</version>
15771579
</dependency>
1580+
<dependency>
1581+
<groupId>com.squareup.okhttp3</groupId>
1582+
<artifactId>logging-interceptor</artifactId>
1583+
<version>${okhttp.version}</version>
1584+
</dependency>
1585+
<dependency>
1586+
<groupId>com.squareup.okio</groupId>
1587+
<artifactId>okio</artifactId>
1588+
<version>${okio.version}</version>
1589+
</dependency>
1590+
<dependency>
1591+
<groupId>org.jetbrains.kotlin</groupId>
1592+
<artifactId>kotlin-stdlib-jdk8</artifactId>
1593+
<version>${kotlin-stdlib.version}</version>
1594+
<exclusions>
1595+
<exclusion>
1596+
<groupId>org.jetbrains</groupId>
1597+
<artifactId>annotations</artifactId>
1598+
</exclusion>
1599+
</exclusions>
1600+
</dependency>
1601+
<dependency>
1602+
<groupId>io.gsonfire</groupId>
1603+
<artifactId>gson-fire</artifactId>
1604+
<version>${gsonfire.version}</version>
1605+
</dependency>
15781606
<dependency>
15791607
<groupId>com.google.code.gson</groupId>
15801608
<artifactId>gson</artifactId>

0 commit comments

Comments
 (0)