diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml index 9d29f59dd6a1..8ade37ce205d 100644 --- a/hadoop-ozone/ozonefs-shaded/pom.xml +++ b/hadoop-ozone/ozonefs-shaded/pom.xml @@ -27,7 +27,10 @@ true - org.apache.hadoop.ozone.shaded + org_apache_ozone_shaded + + org_apache_ratis_thirdparty_ + org.apache.ozone.shaded @@ -35,6 +38,30 @@ com.google.protobuf protobuf-java + + io.netty + netty-resolver-dns-native-macos + osx-x86_64 + + + io.netty + netty-tcnative-boringssl-static + + + io.netty + netty-transport-native-epoll + linux-aarch_64 + + + io.netty + netty-transport-native-epoll + linux-x86_64 + + + io.netty + netty-transport-native-kqueue + osx-x86_64 + org.apache.ozone ozone-filesystem-common @@ -75,6 +102,10 @@ org.apache.logging.log4j * + + org.junit + * + org.slf4j * @@ -102,6 +133,52 @@ package ${maven.shade.skip} + + + com.sun.javadoc:* + com.sun.jndi:* + com.sun.management:* + com.sun.security:* + com.sun.tools:* + org.ietf.jgss:* + org.omg:* + org.w3c.dom:* + org.xerial.snappy:* + org.xml.sax:* + + + + + *:* + + + android/** + + javax/annotation/** + + META-INF/native/liborg_apache_ratis_thirdparty_netty_resolver_dns_native_macos_x86_64.jnilib + META-INF/native/liborg_apache_ratis_thirdparty_netty_tcnative_linux_aarch_64.so + META-INF/native/liborg_apache_ratis_thirdparty_netty_tcnative_linux_x86_64.so + META-INF/native/liborg_apache_ratis_thirdparty_netty_tcnative_osx_aarch_64.jnilib + META-INF/native/liborg_apache_ratis_thirdparty_netty_tcnative_osx_x86_64.jnilib + META-INF/native/liborg_apache_ratis_thirdparty_netty_transport_native_epoll_aarch_64.so + META-INF/native/liborg_apache_ratis_thirdparty_netty_transport_native_epoll_x86_64.so + META-INF/native/liborg_apache_ratis_thirdparty_netty_transport_native_kqueue_x86_64.jnilib + META-INF/native/org_apache_ratis_thirdparty_netty_tcnative_windows_x86_64.dll + + META-INF/native/libnetty_resolver_dns_native_macos_x86_64.jnilib + META-INF/native/libnetty_tcnative_linux_aarch_64.so + META-INF/native/libnetty_tcnative_linux_x86_64.so + META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib + META-INF/native/libnetty_tcnative_osx_x86_64.jnilib + META-INF/native/libnetty_transport_native_epoll_aarch_64.so + META-INF/native/libnetty_transport_native_epoll_x86_64.so + META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib + META-INF/native/netty_tcnative_windows_x86_64.dll + + + @@ -120,38 +197,66 @@ org ${shaded.prefix}.org - - org.yaml.**.* - org.sqlite.**.* - org.tukaani.**.* - org.bouncycastle.**.* - org.rocksdb.**.* - org.apache.commons.cli.**.* - org.apache.commons.compress.**.* - org.apache.commons.codec.**.* - org.apache.commons.beanutils.**.* - org.apache.commons.collections.**.* - org.apache.commons.digester.**.* - org.apache.commons.io.**.* - org.apache.commons.logging.**.* - org.apache.commons.validator.**.* - org.apache.commons.lang3.**.* - org.sqlite.**.* - org.apache.thrift.**.* - + + org.apache.hadoop.** + org.apache.log4j.** + org.apache.ozone.** + org.apache.ratis.** + + org.ietf.jgss.* + org.omg.** + org.slf4j.** + org.w3c.dom.** + org.xerial.snappy.** + org.xml.sax.** + org.wildfly.** + + + + org.apache.ratis + ${shaded.prefix}.org.apache.ratis com ${shaded.prefix}.com - - com.google.common.**.* - com.google.gson.**.* - com.codahale.**.* - com.fasterxml.**.* - com.lmax.**.* - com.github.joshelser.**.* - com.twitter.**.* - + + com.google.protobuf.** + + com.sun.javadoc.** + com.sun.jndi.** + com.sun.management.** + com.sun.security.** + com.sun.tools.** + com.ibm.security.** + + + + google + ${shaded.prefix}.google + + + net.jcip + ${shaded.prefix}.net.jcip + + + javassist + ${shaded.prefix}.javassist + + + javax.xml.bind + ${shaded.prefix}.javax.xml.bind + + + javax.activation + ${shaded.prefix}.javax.activation + + + jakarta.annotation + ${shaded.prefix}.jakarta.annotation kotlin @@ -170,6 +275,18 @@ ${shaded.prefix}.io io!netty!* + + + io.compression.** + io.file.buffer.size + io.mapfile.** + io.map.index + io.seqfile.** + io.serializations + io.skip.checksum.errors + io.sort.** @@ -187,6 +304,85 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-dependencies + + unpack-dependencies + + validate + + io.netty + **/META-INF/native/* + netty-resolver-dns-native-macos, + netty-tcnative-boringssl-static, + netty-transport-native-epoll, + netty-transport-native-kqueue + ${project.build.directory}/classes/ + true + true + + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + + + rename-file + + rename + + generate-sources + + + + ${project.build.directory}/classes/META-INF/native/libnetty_resolver_dns_native_macos_x86_64.jnilib + ${project.build.directory}/classes/META-INF/native/lib${ozone.shaded.native.prefix}_${ratis.thirdparty.shaded.native.prefix}netty_resolver_dns_native_macos_x86_64.jnilib + + + ${project.build.directory}/classes/META-INF/native/libnetty_transport_native_epoll_aarch_64.so + ${project.build.directory}/classes/META-INF/native/lib${ozone.shaded.native.prefix}_${ratis.thirdparty.shaded.native.prefix}netty_transport_native_epoll_aarch_64.so + + + ${project.build.directory}/classes/META-INF/native/libnetty_transport_native_epoll_x86_64.so + ${project.build.directory}/classes/META-INF/native/lib${ozone.shaded.native.prefix}_${ratis.thirdparty.shaded.native.prefix}netty_transport_native_epoll_x86_64.so + + + ${project.build.directory}/classes/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib + ${project.build.directory}/classes/META-INF/native/lib${ozone.shaded.native.prefix}_${ratis.thirdparty.shaded.native.prefix}netty_transport_native_kqueue_x86_64.jnilib + + + ${project.build.directory}/classes/META-INF/native/libnetty_tcnative_linux_aarch_64.so + ${project.build.directory}/classes/META-INF/native/lib${ozone.shaded.native.prefix}_${ratis.thirdparty.shaded.native.prefix}netty_tcnative_linux_aarch_64.so + + + ${project.build.directory}/classes/META-INF/native/libnetty_tcnative_linux_x86_64.so + ${project.build.directory}/classes/META-INF/native/lib${ozone.shaded.native.prefix}_${ratis.thirdparty.shaded.native.prefix}netty_tcnative_linux_x86_64.so + + + ${project.build.directory}/classes/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib + ${project.build.directory}/classes/META-INF/native/lib${ozone.shaded.native.prefix}_${ratis.thirdparty.shaded.native.prefix}netty_tcnative_osx_aarch_64.jnilib + + + ${project.build.directory}/classes/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib + ${project.build.directory}/classes/META-INF/native/lib${ozone.shaded.native.prefix}_${ratis.thirdparty.shaded.native.prefix}libnetty_tcnative_osx_x86_64.jnilib + + + ${project.build.directory}/classes/META-INF/native/netty_tcnative_windows_x86_64.dll + ${project.build.directory}/classes/META-INF/native/${ozone.shaded.native.prefix}_${ratis.thirdparty.shaded.native.prefix}netty_tcnative_windows_x86_64.dll + + + + + + diff --git a/pom.xml b/pom.xml index 47fa1b83ba86..7db1fd60bf93 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ 1.12.0 1.6 0.21.0 + 1.0 4.2.0 2.9.1