From 210ebe13541900807d43a8af1e4941cf40bbb9e5 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Thu, 28 Jan 2016 19:04:27 +0100
Subject: [PATCH] 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.
---
 example/pom.xml                | 4 ++--
 handler/pom.xml                | 2 +-
 pom.xml                        | 6 ++++--
 testsuite/pom.xml              | 2 +-
 transport-native-epoll/pom.xml | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/example/pom.xml b/example/pom.xml
index 1a8b713c7c..6808ed923d 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -81,8 +81,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netty-tcnative</artifactId>
-        <classifier>${tcnative.classifier}</classifier>
+      <artifactId>${tcnative.artifactId}</artifactId>
+      <classifier>${tcnative.classifier}</classifier>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.npn</groupId>
diff --git a/handler/pom.xml b/handler/pom.xml
index ccd894c2a0..041c6f2d2a 100644
--- a/handler/pom.xml
+++ b/handler/pom.xml
@@ -46,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netty-tcnative</artifactId>
+      <artifactId>${tcnative.artifactId}</artifactId>
       <classifier>${tcnative.classifier}</classifier>
       <optional>true</optional>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 3920507834..e5ae5d4f92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,6 +215,8 @@
     <!-- 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.artifactId>netty-tcnative</tcnative.artifactId>
+    <tcnative.version>1.1.33.Fork11</tcnative.version>
     <tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
     <epoll.classifier>${os.detected.name}-${os.detected.arch}</epoll.classifier>
   </properties>
@@ -297,8 +299,8 @@
       <!-- Our own Tomcat Native fork - completely optional, used for acclerating SSL with OpenSSL. -->
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>netty-tcnative</artifactId>
-        <version>1.1.33.Fork11</version>
+        <artifactId>${tcnative.artifactId}</artifactId>
+        <version>${tcnative.version}</version>
         <classifier>${tcnative.classifier}</classifier>
         <scope>compile</scope>
         <optional>true</optional>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index e3b8b390e9..cbf30613ad 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netty-tcnative</artifactId>
+      <artifactId>${tcnative.artifactId}</artifactId>
       <classifier>${tcnative.classifier}</classifier>
       <optional>true</optional>
     </dependency>
diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml
index b4895ea6d2..c386625d64 100644
--- a/transport-native-epoll/pom.xml
+++ b/transport-native-epoll/pom.xml
@@ -50,7 +50,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netty-tcnative</artifactId>
+      <artifactId>${tcnative.artifactId}</artifactId>
       <classifier>${tcnative.classifier}</classifier>
       <scope>test</scope>
     </dependency>