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

86
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
@ -17,17 +17,13 @@
<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>
<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>
@ -69,196 +65,196 @@
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId> <artifactId>netty-buffer</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId> <artifactId>netty-codec</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-dns</artifactId> <artifactId>netty-codec-dns</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-haproxy</artifactId> <artifactId>netty-codec-haproxy</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId> <artifactId>netty-codec-http</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId> <artifactId>netty-codec-http2</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-memcache</artifactId> <artifactId>netty-codec-memcache</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId> <artifactId>netty-codec-mqtt</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-redis</artifactId> <artifactId>netty-codec-redis</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-smtp</artifactId> <artifactId>netty-codec-smtp</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId> <artifactId>netty-codec-socks</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-stomp</artifactId> <artifactId>netty-codec-stomp</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-xml</artifactId> <artifactId>netty-codec-xml</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-common</artifactId> <artifactId>netty-common</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-dev-tools</artifactId> <artifactId>netty-dev-tools</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId> <artifactId>netty-handler</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId> <artifactId>netty-handler-proxy</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId> <artifactId>netty-resolver</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId> <artifactId>netty-resolver-dns</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId> <artifactId>netty-transport</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-sctp</artifactId> <artifactId>netty-transport-sctp</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-example</artifactId> <artifactId>netty-example</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <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>5.0.0.Final-SNAPSHOT</version> <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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>4.1.68.Final-SNAPSHOT</version> <version>${project.version}</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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>4.1.68.Final-SNAPSHOT</version> <version>${project.version}</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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>5.0.0.Final-SNAPSHOT</version> <version>${project.version}</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>4.1.68.Final-SNAPSHOT</version> <version>${project.version}</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 -->