andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure bom don't define extra dependencies (#11682)

Browse Source 
Motivation:

The bom shouldnt depend on the parent as it may define extra dependencies that would be "pulled" in.

See https://github.com/netty/netty/pull/11672#discussion_r707619462

Modifications:

- Revert commit d6383bf2478267eb62b1f71807c2a3c34794d1b0.
- Add tcnative version and add comments to ensure we keep the version in-sync

Result:

Correct bom for netty
This commit is contained in:
Norman Maurer 2021-09-16 09:23:45 +02:00
parent 000f2a0934
commit 8339a00fd6
2 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
bom/pom.xml
View File

@ -17,13 +17,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>io.netty</groupId> <groupId>org.sonatype.oss</groupId>
<artifactId>netty-parent</artifactId> <artifactId>oss-parent</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>7</version>
<relativePath />
</parent> </parent>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId> <artifactId>netty-bom</artifactId>
<version>5.0.0.Final-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Netty/BOM</name> <name>Netty/BOM</name>
<description>Netty (Bill of Materials)</description> <description>Netty (Bill of Materials)</description>
<url>https://netty.io/</url> <url>https://netty.io/</url>
@ -59,202 +63,206 @@
</developer> </developer>
</developers> </developers>
<properties>
<!-- Keep in sync with ../pom.xml -->
<tcnative.version>2.0.43.Final</tcnative.version>
</properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- All release modules --> <!-- All release modules -->
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId> <artifactId>netty-buffer</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId> <artifactId>netty-codec</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-dns</artifactId> <artifactId>netty-codec-dns</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-haproxy</artifactId> <artifactId>netty-codec-haproxy</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId> <artifactId>netty-codec-http</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId> <artifactId>netty-codec-http2</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-memcache</artifactId> <artifactId>netty-codec-memcache</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId> <artifactId>netty-codec-mqtt</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-redis</artifactId> <artifactId>netty-codec-redis</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-smtp</artifactId> <artifactId>netty-codec-smtp</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId> <artifactId>netty-codec-socks</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-stomp</artifactId> <artifactId>netty-codec-stomp</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-xml</artifactId> <artifactId>netty-codec-xml</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-common</artifactId> <artifactId>netty-common</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-dev-tools</artifactId> <artifactId>netty-dev-tools</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId> <artifactId>netty-handler</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId> <artifactId>netty-handler-proxy</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId> <artifactId>netty-resolver</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId> <artifactId>netty-resolver-dns</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId> <artifactId>netty-transport</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-sctp</artifactId> <artifactId>netty-transport-sctp</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-example</artifactId> <artifactId>netty-example</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId> <artifactId>netty-resolver-dns-native-macos</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId> <artifactId>netty-resolver-dns-native-macos</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>osx-x86_64</classifier> <classifier>osx-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId> <artifactId>netty-resolver-dns-native-macos</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>osx-aarch_64</classifier> <classifier>osx-aarch_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId> <artifactId>netty-transport-native-unix-common</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId> <artifactId>netty-transport-native-unix-common</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>linux-aarch_64</classifier> <classifier>linux-aarch_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId> <artifactId>netty-transport-native-unix-common</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>linux-x86_64</classifier> <classifier>linux-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId> <artifactId>netty-transport-native-unix-common</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>osx-x86_64</classifier> <classifier>osx-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId> <artifactId>netty-transport-native-unix-common</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>osx-aarch_64</classifier> <classifier>osx-aarch_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId> <artifactId>netty-transport-native-epoll</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId> <artifactId>netty-transport-native-epoll</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>linux-aarch_64</classifier> <classifier>linux-aarch_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId> <artifactId>netty-transport-native-epoll</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>linux-x86_64</classifier> <classifier>linux-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId> <artifactId>netty-transport-native-kqueue</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId> <artifactId>netty-transport-native-kqueue</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>osx-x86_64</classifier> <classifier>osx-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId> <artifactId>netty-transport-native-kqueue</artifactId>
<version>${project.version}</version> <version>5.0.0.Final-SNAPSHOT</version>
<classifier>osx-aarch_64</classifier> <classifier>osx-aarch_64</classifier>
</dependency> </dependency>
<!-- Add netty-tcnative* as well as users need to ensure they use the correct version --> <!-- Add netty-tcnative* as well as users need to ensure they use the correct version -->

1
pom.xml
View File

@ -468,6 +468,7 @@
<!-- keep in sync with PlatformDependent#ALLOWED_LINUX_OS_CLASSIFIERS --> <!-- keep in sync with PlatformDependent#ALLOWED_LINUX_OS_CLASSIFIERS -->
<os.detection.classifierWithLikes>fedora,suse,arch</os.detection.classifierWithLikes> <os.detection.classifierWithLikes>fedora,suse,arch</os.detection.classifierWithLikes>
<tcnative.artifactId>netty-tcnative</tcnative.artifactId> <tcnative.artifactId>netty-tcnative</tcnative.artifactId>
<!-- Keep in sync with bom/pom.xml -->
<tcnative.version>2.0.43.Final</tcnative.version> <tcnative.version>2.0.43.Final</tcnative.version>
<tcnative.classifier>${os.detected.classifier}</tcnative.classifier> <tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
<conscrypt.groupId>org.conscrypt</conscrypt.groupId> <conscrypt.groupId>org.conscrypt</conscrypt.groupId>