Skip to content

Commit

Permalink
[BACKPORT 2024.1][PLAT-13834]upgrade vulnerable netty libraries
Browse files Browse the repository at this point in the history
Summary:
Original commit: ee222fc/D35745
Upgrade few netty libraries.

Test Plan: Manually verified the new versions in sbt dependencyTree. iTests.

Reviewers: svarshney

Reviewed By: svarshney

Subscribers: yugaware

Tags: #jenkins-ready

Differential Revision: https://phorge.dev.yugabyte.com/D36913
  • Loading branch information
asharma-yb committed Aug 1, 2024
1 parent 2569e7f commit fcb488c
Show file tree
Hide file tree
Showing 14 changed files with 40 additions and 39 deletions.
2 changes: 1 addition & 1 deletion java/interface-annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>

<artifactId>interface-annotations</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Yugabyte</name>
Expand Down Expand Up @@ -104,7 +104,7 @@

<mockito-inline.version>4.7.0</mockito-inline.version>
<murmur.version>1.0.0</murmur.version>
<netty-all.version>4.1.100.Final</netty-all.version>
<netty-all.version>4.1.108.Final</netty-all.version>
<protobuf.version>3.21.7</protobuf.version>
<slf4j.version>1.7.32</slf4j.version>
<spark.version>2.4.8</spark.version>
Expand Down Expand Up @@ -355,7 +355,7 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.yb</groupId>
Expand Down Expand Up @@ -526,7 +526,7 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions java/yb-cdc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>
<groupId>org.yb</groupId>
<artifactId>yb-cdc</artifactId>
Expand Down Expand Up @@ -43,12 +43,12 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions java/yb-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>

<artifactId>yb-cli</artifactId>
Expand All @@ -40,12 +40,12 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions java/yb-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>

<artifactId>yb-client</artifactId>
<name>YB Java Client</name>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<properties>
<yb.thirdparty.dir>${project.basedir}/../../thirdparty</yb.thirdparty.dir>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion java/yb-cql-4x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>
<artifactId>yb-cql-4x</artifactId>
<name>YB CQL Support for 4.x Driver</name>
Expand Down
6 changes: 3 additions & 3 deletions java/yb-cql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>
<artifactId>yb-cql</artifactId>
<name>YB CQL Support</name>
Expand All @@ -16,13 +16,13 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions java/yb-jedis-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>
<artifactId>yb-jedis-tests</artifactId>
<name>YB Jedis Tests</name>
Expand All @@ -33,13 +33,13 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions java/yb-loadtester/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>

<artifactId>yb-loadtester</artifactId>
Expand All @@ -16,14 +16,14 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions java/yb-multiapi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>

<artifactId>yb-multiapi</artifactId>
Expand All @@ -19,14 +19,14 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions java/yb-pgsql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>
<artifactId>yb-pgsql</artifactId>
<name>YB PostgreSQL Support</name>
Expand All @@ -17,13 +17,13 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions java/yb-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>
<artifactId>yb-sample</artifactId>
<name>YB Manual Support</name>
Expand All @@ -17,13 +17,13 @@
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions java/yb-ysql-conn-mgr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,35 +22,35 @@
<parent>
<groupId>org.yb</groupId>
<artifactId>yb-parent</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
</parent>
<artifactId>yb-ysql-conn-mgr</artifactId>
<name>Ysql Connection Manager Tests </name>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-client</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-pgsql</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yb</groupId>
<artifactId>yb-pgsql</artifactId>
<version>0.8.82.1-SNAPSHOT</version>
<version>0.8.82.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
3 changes: 2 additions & 1 deletion managed/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -908,13 +908,14 @@ runPlatform := {
Project.extract(newState).runTask(runPlatformTask, newState)
}

libraryDependencies += "org.yb" % "yb-client" % "0.8.82.1-SNAPSHOT"
libraryDependencies += "org.yb" % "yb-client" % "0.8.82.2-SNAPSHOT"
libraryDependencies += "org.yb" % "ybc-client" % "2.1.0.1-b3"
libraryDependencies += "org.yb" % "yb-perf-advisor" % "1.0.0-b33"

libraryDependencies ++= Seq(
"io.netty" % "netty-tcnative-boringssl-static" % "2.0.54.Final",
"io.netty" % "netty-codec-haproxy" % "4.1.89.Final",
"io.projectreactor.netty" % "reactor-netty-http" % "1.0.39",
"org.slf4j" % "slf4j-ext" % "1.7.26",
"com.nimbusds" % "nimbus-jose-jwt" % "7.9",
)
Expand Down

0 comments on commit fcb488c

Please sign in to comment.