>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19805 )
Change subject: [NO ISSUE][MISC] Eliminate unused native dependencies ...................................................................... [NO ISSUE][MISC] Eliminate unused native dependencies Ext-ref: MB-66739 Change-Id: Ice99c1b3c60855f103aa8574124b0261f7a3f8a5 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19805 Reviewed-by: Michael Blow <[email protected]> Tested-by: Michael Blow <[email protected]> --- M asterixdb/asterix-external-data/pom.xml M asterixdb/pom.xml M hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml M hyracks-fullstack/pom.xml 4 files changed, 109 insertions(+), 18 deletions(-) Approvals: Michael Blow: Looks good to me, approved; Verified diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index b271b57..ea76d4a 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -209,7 +209,6 @@ <usedDependency>net.razorvine:serpent</usedDependency> <usedDependency>io.netty:netty-resolver-dns</usedDependency> <usedDependency>io.netty:netty-codec-http2</usedDependency> - <usedDependency>io.netty:netty-transport-native-unix-common</usedDependency> <usedDependency>io.netty:netty-handler-proxy</usedDependency> </usedDependencies> </configuration> @@ -539,10 +538,6 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-transport-native-unix-common</artifactId> - </dependency> - <dependency> - <groupId>io.netty</groupId> <artifactId>netty-handler-proxy</artifactId> </dependency> <!-- Manually included to avoid CVE-2023-1370 --> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 93d129d..aa048c6 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -1084,6 +1084,10 @@ <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1538,6 +1542,12 @@ <groupId>software.amazon.awssdk</groupId> <artifactId>s3</artifactId> <version>${awsjavasdk.version}</version> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-classes-epoll</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> @@ -1609,6 +1619,24 @@ <groupId>com.azure</groupId> <artifactId>azure-storage-blob</artifactId> <version>${azureblobjavasdk.version}</version> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-kqueue</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns-native-macos</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.azure</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml index 2010653..ed9ece4 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml @@ -148,10 +148,6 @@ <scope>test</scope> <exclusions> <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 3c50278..00cc2e5 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -89,6 +89,68 @@ <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> <version>${netty.version}</version> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-classes-epoll</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-kqueue</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-classes-kqueue</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns-classes-macos</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns-native-macos</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-rxtx</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-sctp</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-udt</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-memcache</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-mqtt</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-redis</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-smtp</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-socks</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-stomp</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.netty</groupId> @@ -119,6 +181,12 @@ <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> <version>${netty.version}</version> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.netty</groupId> @@ -163,11 +231,6 @@ <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> <version>4.13.2</version> @@ -227,10 +290,6 @@ <version>${hadoop.version}</version> <exclusions> <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19805 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-667a908755 Gerrit-Change-Id: Ice99c1b3c60855f103aa8574124b0261f7a3f8a5 Gerrit-Change-Number: 19805 Gerrit-PatchSet: 7 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-CC: Anon. E. Moose #1000171 Gerrit-MessageType: merged
