Allow to specify tcnative artifactId and verion to allow run tests easily with different tcnative flavors
Motivation: As we now can easily build static linked versions of tcnative it makes sense to run our netty build against all of them. This helps to ensure our code works with libressl, openssl and boringssl. Modifications: Allow to specify -Dtcnative.artifactId= and -Dtcnative.version= Result: Easy to run netty build against different tcnative flavors.
This commit is contained in:
parent
b647513b6b
commit
7522cade65
@ -61,7 +61,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>${tcnative.artifactId}</artifactId>
|
||||||
<classifier>${tcnative.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>${tcnative.artifactId}</artifactId>
|
||||||
<classifier>${tcnative.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
6
pom.xml
6
pom.xml
@ -215,6 +215,8 @@
|
|||||||
<!-- Configure the os-maven-plugin extension to expand the classifier on -->
|
<!-- Configure the os-maven-plugin extension to expand the classifier on -->
|
||||||
<!-- Fedora-"like" systems. This is currently only used for the netty-tcnative dependency -->
|
<!-- Fedora-"like" systems. This is currently only used for the netty-tcnative dependency -->
|
||||||
<os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
|
<os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
|
||||||
|
<tcnative.artifactId>netty-tcnative</tcnative.artifactId>
|
||||||
|
<tcnative.version>1.1.33.Fork11</tcnative.version>
|
||||||
<tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
|
<tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
|
||||||
<epoll.classifier>${os.detected.name}-${os.detected.arch}</epoll.classifier>
|
<epoll.classifier>${os.detected.name}-${os.detected.arch}</epoll.classifier>
|
||||||
</properties>
|
</properties>
|
||||||
@ -283,8 +285,8 @@
|
|||||||
<!-- Our own Tomcat Native fork - completely optional, used for acclerating SSL with OpenSSL. -->
|
<!-- Our own Tomcat Native fork - completely optional, used for acclerating SSL with OpenSSL. -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>${tcnative.artifactId}</artifactId>
|
||||||
<version>1.1.33.Fork11</version>
|
<version>${tcnative.version}</version>
|
||||||
<classifier>${tcnative.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>${tcnative.artifactId}</artifactId>
|
||||||
<classifier>${tcnative.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-tcnative</artifactId>
|
<artifactId>${tcnative.artifactId}</artifactId>
|
||||||
<classifier>${tcnative.classifier}</classifier>
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
Loading…
Reference in New Issue
Block a user