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

netty-bom to provide resolved tcnative version (#11672)

Browse Source 
Motivation:
Netty's bom includes netty-tcnative dependencies with a variable for the
version [1]. However that variable isn't defined/resolved and therefore
leads to undefined dependencies.

[1] https://search.maven.org/artifact/io.netty/netty-bom/4.1.68.Final/pom

Modifications:
- Netty's bom file should inherit from netty-parent pom so variables can
  be resolved at inclusion time.

Result:
netty-bom allows for netty-tcnative version to be resolved in 3rd party
projects.
This commit is contained in:
Scott Mitchell 2021-09-10 09:56:00 -07:00
parent d523e68d83
commit 62a23f9e29
1 changed files with 299 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

600
bom/pom.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
~ Copyright 2017 The Netty Project ~ Copyright 2017, 2012 The Netty Project
~ ~
~ The Netty Project licenses this file to you under the Apache License, ~ The Netty Project licenses this file to you under the Apache License,
~ version 2.0 (the "License"); you may not use this file except in compliance ~ version 2.0 (the "License"); you may not use this file except in compliance
@ -15,311 +15,307 @@
~ under the License. ~ under the License.
--> -->
<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>org.sonatype.oss</groupId> <groupId>io.netty</groupId>
<artifactId>oss-parent</artifactId> <artifactId>netty-parent</artifactId>
<version>7</version> <version>5.0.0.Final-SNAPSHOT</version>
<relativePath /> </parent>
</parent>
<groupId>io.netty</groupId> <artifactId>netty-bom</artifactId>
<artifactId>netty-bom</artifactId> <packaging>pom</packaging>
<version>5.0.0.Final-SNAPSHOT</version> <name>Netty/BOM</name>
<packaging>pom</packaging> <description>Netty (Bill of Materials)</description>
<name>Netty/BOM</name>
<description>Netty (Bill of Materials)</description>
<url>https://netty.io/</url>
<organization>
<name>The Netty Project</name>
<url>https://netty.io/</url> <url>https://netty.io/</url>
</organization>
<licenses> <organization>
<license> <name>The Netty Project</name>
<name>Apache License, Version 2.0</name> <url>https://netty.io/</url>
<url>https://www.apache.org/licenses/LICENSE-2.0</url> </organization>
</license>
</licenses>
<inceptionYear>2008</inceptionYear>
<scm> <licenses>
<url>https://github.com/netty/netty</url> <license>
<connection>scm:git:git://github.com/netty/netty.git</connection> <name>Apache License, Version 2.0</name>
<developerConnection>scm:git:ssh://git@github.com/netty/netty.git</developerConnection> <url>https://www.apache.org/licenses/LICENSE-2.0</url>
<tag>HEAD</tag> </license>
</scm> </licenses>
<inceptionYear>2008</inceptionYear>
<developers> <scm>
<developer> <url>https://github.com/netty/netty</url>
<id>netty.io</id> <connection>scm:git:git://github.com/netty/netty.git</connection>
<name>The Netty Project Contributors</name> <developerConnection>scm:git:ssh://git@github.com/netty/netty.git</developerConnection>
<email>netty@googlegroups.com</email> <tag>HEAD</tag>
<url>https://netty.io/</url> </scm>
<organization>The Netty Project</organization>
<organizationUrl>https://netty.io/</organizationUrl>
</developer>
</developers>
<dependencyManagement> <developers>
<dependencies> <developer>
<!-- All release modules --> <id>netty.io</id>
<dependency> <name>The Netty Project Contributors</name>
<groupId>io.netty</groupId> <email>netty@googlegroups.com</email>
<artifactId>netty-buffer</artifactId> <url>https://netty.io/</url>
<version>5.0.0.Final-SNAPSHOT</version> <organization>The Netty Project</organization>
</dependency> <organizationUrl>https://netty.io/</organizationUrl>
<dependency> </developer>
<groupId>io.netty</groupId> </developers>
<artifactId>netty-codec</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <dependencyManagement>
</dependency> <dependencies>
<dependency> <!-- All release modules -->
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-dns</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-buffer</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-haproxy</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-http</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-dns</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-http2</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-haproxy</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-memcache</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-http</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-mqtt</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-http2</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-redis</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-memcache</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-smtp</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-mqtt</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-socks</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-redis</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-stomp</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-smtp</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-codec-xml</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-socks</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-common</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-stomp</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-dev-tools</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-codec-xml</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-handler</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-common</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-handler-proxy</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-dev-tools</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-resolver</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-handler</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-resolver-dns</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-handler-proxy</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-transport</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-resolver</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-transport-sctp</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-resolver-dns</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-example</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-transport</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-all</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-transport-sctp</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-resolver-dns-native-macos</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-example</artifactId>
</dependency> <version>${project.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-resolver-dns-native-macos</artifactId> <groupId>io.netty</groupId>
<version>5.0.0.Final-SNAPSHOT</version> <artifactId>netty-all</artifactId>
<classifier>osx-x86_64</classifier> <version>${project.version}</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>4.1.68.Final-SNAPSHOT</version> <version>${project.version}</version>
<classifier>osx-aarch_64</classifier> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-resolver-dns-native-macos</artifactId>
<artifactId>netty-transport-native-unix-common</artifactId> <version>${project.version}</version>
<version>5.0.0.Final-SNAPSHOT</version> <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-resolver-dns-native-macos</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
<classifier>linux-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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
<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>linux-aarch_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>4.1.68.Final-SNAPSHOT</version> <classifier>linux-x86_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-epoll</artifactId> <version>${project.version}</version>
<version>5.0.0.Final-SNAPSHOT</version> <classifier>osx-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId> <artifactId>netty-transport-native-unix-common</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
<classifier>linux-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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
<classifier>linux-x86_64</classifier> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId>
<artifactId>netty-transport-native-kqueue</artifactId> <version>${project.version}</version>
<version>5.0.0.Final-SNAPSHOT</version> <classifier>linux-aarch_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId> <artifactId>netty-transport-native-epoll</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
<classifier>osx-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>4.1.68.Final-SNAPSHOT</version> <version>${project.version}</version>
<classifier>osx-aarch_64</classifier> </dependency>
</dependency> <dependency>
<!-- Add netty-tcnative* as well as users need to ensure they use the correct version --> <groupId>io.netty</groupId>
<dependency> <artifactId>netty-transport-native-kqueue</artifactId>
<groupId>io.netty</groupId> <version>${project.version}</version>
<artifactId>netty-tcnative</artifactId> <classifier>osx-x86_64</classifier>
<version>${tcnative.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-transport-native-kqueue</artifactId>
<artifactId>netty-tcnative</artifactId> <version>${project.version}</version>
<version>${tcnative.version}</version> <classifier>osx-aarch_64</classifier>
<classifier>linux-x86_64</classifier> </dependency>
</dependency> <!-- Add netty-tcnative* as well as users need to ensure they use the correct version -->
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId> <artifactId>netty-tcnative</artifactId>
<version>${tcnative.version}</version> <version>${tcnative.version}</version>
<classifier>linux-aarch_64</classifier> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-tcnative</artifactId>
<artifactId>netty-tcnative</artifactId> <version>${tcnative.version}</version>
<version>${tcnative.version}</version> <classifier>linux-x86_64</classifier>
<classifier>osx-x86_64</classifier> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-tcnative</artifactId>
<artifactId>netty-tcnative-boringssl-static</artifactId> <version>${tcnative.version}</version>
<version>${tcnative.version}</version> <classifier>linux-aarch_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId> <artifactId>netty-tcnative</artifactId>
<version>${tcnative.version}</version> <version>${tcnative.version}</version>
<classifier>linux-x86_64</classifier> <classifier>osx-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId> <artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${tcnative.version}</version> <version>${tcnative.version}</version>
<classifier>linux-aarch_64</classifier> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-tcnative-boringssl-static</artifactId>
<artifactId>netty-tcnative-boringssl-static</artifactId> <version>${tcnative.version}</version>
<version>${tcnative.version}</version> <classifier>linux-x86_64</classifier>
<classifier>osx-x86_64</classifier> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-tcnative-boringssl-static</artifactId>
<artifactId>netty-tcnative-boringssl-static</artifactId> <version>${tcnative.version}</version>
<version>${tcnative.version}</version> <classifier>linux-aarch_64</classifier>
<classifier>osx-aarch_64</classifier> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-tcnative-boringssl-static</artifactId>
<artifactId>netty-tcnative-boringssl-static</artifactId> <version>${tcnative.version}</version>
<version>${tcnative.version}</version> <classifier>osx-x86_64</classifier>
<classifier>windows-x86_64</classifier> </dependency>
</dependency> <dependency>
</dependencies> <groupId>io.netty</groupId>
</dependencyManagement> <artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${tcnative.version}</version>
<classifier>osx-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${tcnative.version}</version>
<classifier>windows-x86_64</classifier>
</dependency>
</dependencies>
</dependencyManagement>
</project> </project>