>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21327?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: MB-72251: Null merge branch 'gerrit/stabilization-b4f3098763'
into 'gerrit/morpheus'
......................................................................
MB-72251: Null merge branch 'gerrit/stabilization-b4f3098763' into
'gerrit/morpheus'
* [NO ISSUE][MISC] Update Netty to 4.1.135.Final for CVEs (MB-72251)
Change-Id: If01b393ccb742e794830321091bd339158f5d97f
---
M asterixdb/pom.xml
2 files changed, 3 insertions(+), 53 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 0b2181f..d9a0a0d 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -103,7 +103,6 @@
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
<hadoop-gcs.version>hadoop3-2.2.25</hadoop-gcs.version>
<io.opencensus.version>0.31.1</io.opencensus.version>
- <netty.tcnative.version>2.0.78.Final</netty.tcnative.version>
<implementation.title>Apache AsterixDB -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -1851,52 +1850,11 @@
<version>9.4.57.v20241219</version>
</dependency>
<dependency>
-<<<<<<< HEAD (cdecd1 Merge branch 'gerrit/trinity' into 'gerrit/morpheus')
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>1.80.0</version>
<type>pom</type>
<scope>import</scope>
-=======
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>${netty.tcnative.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-classes</artifactId>
- <version>${netty.tcnative.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <classifier>linux-x86_64</classifier>
- <version>${netty.tcnative.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <classifier>linux-aarch_64</classifier>
- <version>${netty.tcnative.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <classifier>osx-x86_64</classifier>
- <version>${netty.tcnative.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <classifier>osx-aarch_64</classifier>
- <version>${netty.tcnative.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <classifier>windows-x86_64</classifier>
- <version>${netty.tcnative.version}</version>
->>>>>>> BRANCH (bbc507 [NO ISSUE][MISC] Update Netty to 4.1.135.Final for CVEs)
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -1910,17 +1868,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty</artifactId>
- <version>1.79.0</version>
- <exclusions>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty-shaded</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-http-util</artifactId>
<version>${io.opencensus.version}</version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21327?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: morpheus
Gerrit-Change-Id: If01b393ccb742e794830321091bd339158f5d97f
Gerrit-Change-Number: 21327
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Jenkins <[email protected]>
