From 0d30e7a62795fbe6722ecddc086897d1cad3ab42 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Wed, 19 May 2021 11:12:52 +0200 Subject: [PATCH] Fix netty-all artifact (#11274) Motivation: 612ab584489eae74b28ce0bc1b75fb23c5d24b57 did change the way how netty-all was produced by unfortunally it messed up the dependency graph for our native artifacts. This commit reverts changes done by 612ab584489eae74b28ce0bc1b75fb23c5d24b57 and also clean up the profiles Modifications: netty-all is useable again Result: Fixes https://github.com/netty/netty/issues/11272 --- all/pom.xml | 392 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 276 insertions(+), 116 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 7a117d13133..b7592e3fdfc 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -66,24 +66,28 @@ netty-transport-native-epoll linux-x86_64 compile + true ${project.groupId} netty-transport-native-epoll linux-aarch_64 compile + true ${project.groupId} netty-transport-native-kqueue osx-x86_64 compile + true ${project.groupId} netty-resolver-dns-native-macos osx-x86_64 compile + true @@ -98,24 +102,28 @@ netty-transport-native-epoll linux-x86_64 compile + true ${project.groupId} netty-transport-native-epoll linux-aarch_64 compile + true ${project.groupId} netty-transport-native-kqueue osx-x86_64 compile + true ${project.groupId} netty-resolver-dns-native-macos osx-x86_64 compile + true @@ -138,17 +146,20 @@ ${project.version} ${jni.classifier} compile + true ${project.groupId} netty-transport-native-kqueue compile + true ${project.groupId} netty-resolver-dns-native-macos compile + true @@ -170,6 +181,7 @@ ${project.version} ${jni.classifier} compile + true ${project.groupId} @@ -177,12 +189,14 @@ ${project.version} ${jni.classifier} compile + true ${project.groupId} netty-transport-native-epoll compile + true @@ -202,17 +216,20 @@ ${project.version} ${jni.classifier} compile + true ${project.groupId} netty-resolver-dns-native-macos compile + true ${project.groupId} netty-transport-native-epoll compile + true @@ -232,240 +249,383 @@ ${project.version} ${jni.classifier} compile + true ${project.groupId} netty-resolver-dns-native-macos compile + true ${project.groupId} netty-transport-native-epoll compile + true - - - full - - - - - - - maven-jxr-plugin - - - generate-xref - package - - jxr - - - - - true - ${project.build.directory}/xref - ${project.build.directory}/api - Netty Source Xref (${project.version}) - Netty Source Xref (${project.version}) - - - - ${project.groupId} - netty-build-common - ${netty.build.version} - - - - - - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - ${quickbuild} - *.internal,*.example - true - ${project.build.directory}/api - ${project.basedir}/src/javadoc/overview.html - Netty API Reference (${project.version}) - Netty API Reference (${project.version}) - false - - -link https://docs.oracle.com/javase/7/docs/api/ - -link https://developers.google.com/protocol-buffers/docs/reference/java/ - -link https://docs.oracle.com/javaee/6/api/ - -link https://www.slf4j.org/apidocs/ - -link https://commons.apache.org/proper/commons-logging/apidocs/ - -link https://logging.apache.org/log4j/1.2/apidocs/ - - -group "Low-level data representation" io.netty.buffer* - -group "Central interface for all I/O operations" io.netty.channel* - -group "Client & Server bootstrapping utilities" io.netty.bootstrap* - -group "Reusable I/O event interceptors" io.netty.handler* - -group "Miscellaneous" io.netty.util* - - en_US - - - - - - - coverage - - - - org.jacoco - jacoco-maven-plugin - - - jacoco-merge - prepare-package - - merge - - - - - ${project.parent.build.directory}/.. - - **/target/jacoco.exec - - - - - - - jacoco-report - prepare-package - - report - - - ${project.build.directory}/jacoco-report - - - - - - - - ${project.groupId} netty-buffer compile + true ${project.groupId} netty-codec compile + true ${project.groupId} netty-codec-dns compile + true ${project.groupId} netty-codec-haproxy compile + true ${project.groupId} netty-codec-http compile + true ${project.groupId} netty-codec-http2 compile + true ${project.groupId} netty-codec-memcache compile + true ${project.groupId} netty-codec-mqtt compile + true ${project.groupId} netty-codec-redis compile + true ${project.groupId} netty-codec-smtp compile + true ${project.groupId} netty-codec-socks compile + true ${project.groupId} netty-codec-stomp compile + true ${project.groupId} netty-codec-xml compile + true ${project.groupId} netty-common compile + true ${project.groupId} netty-handler compile + true ${project.groupId} netty-handler-proxy compile + true ${project.groupId} netty-resolver compile + true ${project.groupId} netty-resolver-dns compile + true ${project.groupId} netty-transport compile + true ${project.groupId} netty-transport-sctp compile + true + + + + + maven-clean-plugin + + + clean-first + generate-resources + + clean + + + + + + maven-dependency-plugin + + + + locate-dependencies + initialize + + properties + + + + + + unpack-sources + prepare-package + + unpack-dependencies + + + sources + io/netty/** + runtime + ${project.groupId} + ${generatedSourceDir} + + + + + + unpack-jars + prepare-package + + unpack-dependencies + + + io/netty/internal/tcnative/**,io/netty/example/**,META-INF/native/libnetty_tcnative*,META-INF/native/include/**,META-INF/native/**/*.a + io/netty/**,META-INF/native/**,META-INF/native-image/** + runtime + ${project.groupId} + ${project.build.outputDirectory} + + + + + + + maven-antrun-plugin + + + + write-version-properties + none + + + merge-version-properties + prepare-package + + run + + + + + + + + + + + + + + + + + + + + + + + + + clean-source-directory + package + + run + + + + + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + prepare-package + + add-source + + + + ${generatedSourceDir} + + + + + + + + + org.apache.felix + maven-bundle-plugin + + + generate-manifest + none + + + + + + maven-jar-plugin + + + default-jar + none + + + all-in-one-jar + package + + jar + + + + + true + + + io.netty.all + + true + + + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + default + none + + + + + + + maven-checkstyle-plugin + + + check-style + none + + + + + + + maven-resources-plugin + + + default-resources + none + + + default-testResources + none + + + + + maven-compiler-plugin + + + default-compile + none + + + default-testCompile + none + + + + + maven-surefire-plugin + + + default-test + none + + + + +