Update Netty to latest netty-tcnative
Motivation: The latest netty-tcnative fixes a bug in determining the version of the runtime openssl lib. It also publishes an artificact with the classifier linux-<arch>-fedora for fedora-based systems. Modifications: Modified the build files to use the "-fedora" classifier when appropriate for tcnative. Care is taken, however, to not change the classifier for the native epoll transport. Result: Netty is updated the the new shiny netty-tcnative.
This commit is contained in:
parent
428c11ea59
commit
65d481c24c
@ -94,7 +94,7 @@
|
|||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-transport-native-epoll</artifactId>
|
<artifactId>netty-transport-native-epoll</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
<classifier>${os.detected.classifier}</classifier>
|
<classifier>${epoll.classifier}</classifier>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>netty-tcnative</artifactId>
|
||||||
<classifier>${os.detected.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.npn</groupId>
|
<groupId>org.eclipse.jetty.npn</groupId>
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>netty-tcnative</artifactId>
|
||||||
<classifier>${os.detected.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
13
pom.xml
13
pom.xml
@ -154,7 +154,7 @@
|
|||||||
Release process must be performed on linux-x86_64.
|
Release process must be performed on linux-x86_64.
|
||||||
</regexMessage>
|
</regexMessage>
|
||||||
<property>os.detected.classifier</property>
|
<property>os.detected.classifier</property>
|
||||||
<regex>^linux-x86_64$</regex>
|
<regex>^linux-x86_64(\\-fedora)?$</regex>
|
||||||
</requireProperty>
|
</requireProperty>
|
||||||
<requireFilesContent>
|
<requireFilesContent>
|
||||||
<message>
|
<message>
|
||||||
@ -607,6 +607,11 @@
|
|||||||
<argLine.bootcp>-Xbootclasspath/p:${jetty.alpn.path}</argLine.bootcp>
|
<argLine.bootcp>-Xbootclasspath/p:${jetty.alpn.path}</argLine.bootcp>
|
||||||
<argLine.leak>-D_</argLine.leak> <!-- Overridden when 'leak' profile is active -->
|
<argLine.leak>-D_</argLine.leak> <!-- Overridden when 'leak' profile is active -->
|
||||||
<argLine.coverage>-D_</argLine.coverage> <!-- Overridden when 'coverage' profile is active -->
|
<argLine.coverage>-D_</argLine.coverage> <!-- Overridden when 'coverage' profile is active -->
|
||||||
|
<!-- Configure the os-maven-plugin extension to expand the classifier on -->
|
||||||
|
<!-- Fedora-"like" systems. This is currently only used for the netty-tcnative dependency -->
|
||||||
|
<os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
|
||||||
|
<tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
|
||||||
|
<epoll.classifier>${os.detected.name}-${os.detected.arch}</epoll.classifier>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@ -682,8 +687,8 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>netty-tcnative</artifactId>
|
||||||
<version>1.1.33.Fork6</version>
|
<version>1.1.33.Fork7</version>
|
||||||
<classifier>${os.detected.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -899,7 +904,7 @@
|
|||||||
<extension>
|
<extension>
|
||||||
<groupId>kr.motd.maven</groupId>
|
<groupId>kr.motd.maven</groupId>
|
||||||
<artifactId>os-maven-plugin</artifactId>
|
<artifactId>os-maven-plugin</artifactId>
|
||||||
<version>1.2.3.Final</version>
|
<version>1.4.0.Final</version>
|
||||||
</extension>
|
</extension>
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>netty-tcnative</artifactId>
|
||||||
<classifier>${os.detected.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>netty-tcnative</artifactId>
|
||||||
<classifier>${os.detected.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
@ -105,7 +105,7 @@
|
|||||||
<goal>jar</goal>
|
<goal>jar</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<classifier>${os.detected.classifier}</classifier>
|
<classifier>${epoll.classifier}</classifier>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
Loading…
Reference in New Issue
Block a user