>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21158?usp=email )
Change subject: [NO ISSUE][NET] Consume grpc netty directly instead of shaded artifact ...................................................................... [NO ISSUE][NET] Consume grpc netty directly instead of shaded artifact - advance netty-tcnative-boringssl-static Ext-ref: MB-71238 Change-Id: I17684e1961dbc863fa3426a0fc1c779502c3cd0f Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21158 Reviewed-by: Michael Blow <[email protected]> Tested-by: Michael Blow <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Tested-by: Jenkins <[email protected]> --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-external-data/pom.xml M asterixdb/pom.xml M hyracks-fullstack/pom.xml 4 files changed, 38 insertions(+), 120 deletions(-) Approvals: Michael Blow: Looks good to me, but someone else must approve; Verified Jenkins: Verified Ian Maxon: Looks good to me, approved diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index 0c4b94c..f760373 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -920,6 +920,10 @@ <groupId>com.google.cloud</groupId> <artifactId>google-cloud-storage</artifactId> </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty</artifactId> + </dependency> <!-- Needed for inferring the schema for writing Parquet files --> <dependency> <groupId>org.kitesdk</groupId> diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index 184320a..ef84bea 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -484,6 +484,10 @@ <artifactId>google-cloud-storage</artifactId> </dependency> <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty</artifactId> + </dependency> + <dependency> <groupId>org.msgpack</groupId> <artifactId>msgpack-core</artifactId> </dependency> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index c452be3..a8481bc 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -1658,6 +1658,12 @@ <groupId>com.google.cloud</groupId> <artifactId>google-cloud-storage</artifactId> <version>${gcsjavasdk.version}</version> + <exclusions> + <exclusion> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty-shaded</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Google Cloud Storage end --> <!-- Azure Data Lake start --> @@ -1820,6 +1826,10 @@ <groupId>org.checkerframework</groupId> <artifactId>checker-compat-qual</artifactId> </exclusion> + <exclusion> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty-shaded</artifactId> + </exclusion> </exclusions> </dependency> <!-- Hadoop GCS end --> @@ -1840,11 +1850,6 @@ <version>9.4.57.v20241219</version> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-tcnative-boringssl-static</artifactId> - <version>2.0.75.Final</version> - </dependency> - <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-bom</artifactId> <version>1.80.0</version> @@ -1852,6 +1857,17 @@ <scope>import</scope> </dependency> <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty</artifactId> + <version>1.80.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> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 5aa00d1..0a13f39 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -86,6 +86,15 @@ <dependencies> <dependency> <groupId>io.netty</groupId> + <artifactId>netty-bom</artifactId> + <version>${netty.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <!-- Explicitly include netty dependencies with exclusions to avoid CVEs in native transports and codecs that + are not used. --> + <dependency> + <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> <version>${netty.version}</version> <exclusions> @@ -157,21 +166,6 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-buffer</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-common</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-http</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> <artifactId>netty-transport</artifactId> <version>${netty.version}</version> <exclusions> @@ -195,21 +189,6 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-codec</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-dns</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-socks</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> <version>${netty.version}</version> <exclusions> @@ -221,16 +200,6 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-handler-proxy</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> <artifactId>netty-resolver</artifactId> <version>${netty.version}</version> <exclusions> @@ -240,81 +209,6 @@ </exclusion> </exclusions> </dependency> - <!-- - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-resolver-dns-native-macos</artifactId> - <version>${netty.version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-resolver-dns-classes-macos</artifactId> - <version>${netty.version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - --> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - <classifier>linux-x86_64</classifier> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-kqueue</artifactId> - <classifier>osx-x86_64</classifier> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-kqueue</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-resolver-dns</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-resolver-dns-native-macos</artifactId> - <version>${netty.version}</version> - <classifier>osx-x86_64</classifier> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-resolver-dns-native-macos</artifactId> - <version>${netty.version}</version> - <classifier>osx-aarch_64</classifier> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-resolver-dns-classes-macos</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-http2</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-unix-common</artifactId> - <version>${netty.version}</version> - </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21158?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: trinity Gerrit-Change-Id: I17684e1961dbc863fa3426a0fc1c779502c3cd0f Gerrit-Change-Number: 21158 Gerrit-PatchSet: 4 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-CC: Anon. E. Moose #1000171
