Skip to content

Commit 2a20038

Browse files
author
nmittler
committed
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.
1 parent 6daf324 commit 2a20038

File tree

7 files changed

+16
-11
lines changed

7 files changed

+16
-11
lines changed

all/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<groupId>${project.groupId}</groupId>
9595
<artifactId>netty-transport-native-epoll</artifactId>
9696
<version>${project.version}</version>
97-
<classifier>${os.detected.classifier}</classifier>
97+
<classifier>${epoll.classifier}</classifier>
9898
<scope>compile</scope>
9999
<optional>true</optional>
100100
</dependency>

example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>${project.groupId}</groupId>
8383
<artifactId>netty-tcnative</artifactId>
84-
<classifier>${os.detected.classifier}</classifier>
84+
<classifier>${tcnative.classifier}</classifier>
8585
</dependency>
8686
<dependency>
8787
<groupId>org.eclipse.jetty.npn</groupId>

handler/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>${project.groupId}</groupId>
4949
<artifactId>netty-tcnative</artifactId>
50-
<classifier>${os.detected.classifier}</classifier>
50+
<classifier>${tcnative.classifier}</classifier>
5151
<optional>true</optional>
5252
</dependency>
5353
<dependency>

microbench/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<groupId>${project.groupId}</groupId>
6969
<artifactId>netty-transport-native-epoll</artifactId>
7070
<version>${project.version}</version>
71-
<classifier>linux-${epoll.arch}</classifier>
71+
<classifier>${epoll.classifier}</classifier>
7272
</dependency>
7373
<dependency>
7474
<groupId>junit</groupId>

pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
Release process must be performed on linux-x86_64.
150150
</regexMessage>
151151
<property>os.detected.classifier</property>
152-
<regex>^linux-x86_64$</regex>
152+
<regex>^linux-x86_64(\\-fedora)?$</regex>
153153
</requireProperty>
154154
<requireFilesContent>
155155
<message>
@@ -602,6 +602,11 @@
602602
<argLine.bootcp>-Xbootclasspath/p:${jetty.alpn.path}</argLine.bootcp>
603603
<argLine.leak>-D_</argLine.leak> <!-- Overridden when 'leak' profile is active -->
604604
<argLine.coverage>-D_</argLine.coverage> <!-- Overridden when 'coverage' profile is active -->
605+
<!-- Configure the os-maven-plugin extension to expand the classifier on -->
606+
<!-- Fedora-"like" systems. This is currently only used for the netty-tcnative dependency -->
607+
<os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
608+
<tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
609+
<epoll.classifier>${os.detected.name}-${os.detected.arch}</epoll.classifier>
605610
</properties>
606611

607612
<modules>
@@ -691,8 +696,8 @@
691696
<dependency>
692697
<groupId>${project.groupId}</groupId>
693698
<artifactId>netty-tcnative</artifactId>
694-
<version>1.1.33.Fork6</version>
695-
<classifier>${os.detected.classifier}</classifier>
699+
<version>1.1.33.Fork7</version>
700+
<classifier>${tcnative.classifier}</classifier>
696701
<scope>compile</scope>
697702
<optional>true</optional>
698703
</dependency>
@@ -937,7 +942,7 @@
937942
<extension>
938943
<groupId>kr.motd.maven</groupId>
939944
<artifactId>os-maven-plugin</artifactId>
940-
<version>1.2.3.Final</version>
945+
<version>1.4.0.Final</version>
941946
</extension>
942947
</extensions>
943948

testsuite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>${project.groupId}</groupId>
5454
<artifactId>netty-tcnative</artifactId>
55-
<classifier>${os.detected.classifier}</classifier>
55+
<classifier>${tcnative.classifier}</classifier>
5656
<optional>true</optional>
5757
</dependency>
5858

transport-native-epoll/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>${project.groupId}</groupId>
5353
<artifactId>netty-tcnative</artifactId>
54-
<classifier>${os.detected.classifier}</classifier>
54+
<classifier>${tcnative.classifier}</classifier>
5555
<scope>test</scope>
5656
</dependency>
5757
</dependencies>
@@ -105,7 +105,7 @@
105105
<goal>jar</goal>
106106
</goals>
107107
<configuration>
108-
<classifier>${os.detected.classifier}</classifier>
108+
<classifier>${epoll.classifier}</classifier>
109109
</configuration>
110110
</execution>
111111
</executions>

0 commit comments

Comments
 (0)