activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/3] activemq-artemis git commit: ARTEMIS-1913 Dependency to netty tcpnative should be optional
Date Wed, 06 Jun 2018 20:14:40 GMT
ARTEMIS-1913 Dependency to netty tcpnative should be optional

(cherry picked from commit b6fba64d9ed843160a2f45e2631737ff15e6d40f)


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7a1f9311
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7a1f9311
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7a1f9311

Branch: refs/heads/2.6.x
Commit: 7a1f9311efcf3067ea78cd83aaf246cddd096d1d
Parents: 0b460ea
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Wed Jun 6 12:57:45 2018 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Wed Jun 6 16:14:29 2018 -0400

----------------------------------------------------------------------
 artemis-core-client/pom.xml                      | 5 -----
 examples/features/standard/netty-openssl/pom.xml | 8 ++++++++
 pom.xml                                          | 7 -------
 tests/integration-tests/pom.xml                  | 6 ++++++
 tests/unit-tests/pom.xml                         | 6 ++++++
 5 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a1f9311/artemis-core-client/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index 092b8c3..47b72e2 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -118,11 +118,6 @@
          <groupId>io.netty</groupId>
          <artifactId>netty-common</artifactId>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-tcnative-boringssl-static</artifactId>
-      </dependency>
-
    </dependencies>
 
    <profiles>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a1f9311/examples/features/standard/netty-openssl/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/netty-openssl/pom.xml b/examples/features/standard/netty-openssl/pom.xml
index 5f61a20..b146d28 100644
--- a/examples/features/standard/netty-openssl/pom.xml
+++ b/examples/features/standard/netty-openssl/pom.xml
@@ -33,6 +33,7 @@ under the License.
 
    <properties>
       <activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
+      <netty.tcnative.version>2.0.7.Final</netty.tcnative.version>
    </properties>
 
    <dependencies>
@@ -41,6 +42,12 @@ under the License.
          <artifactId>artemis-jms-client-all</artifactId>
          <version>${project.version}</version>
       </dependency>
+      <dependency>
+         <groupId>io.netty</groupId>
+         <artifactId>netty-tcnative-boringssl-static</artifactId>
+         <version>${netty.tcnative.version}</version>
+         <!-- License: Apache 2.0 -->
+      </dependency>
    </dependencies>
 
    <build>
@@ -56,6 +63,7 @@ under the License.
                   </goals>
                   <configuration>
                      <ignore>${noServer}</ignore>
+                     <libList>io.netty:netty-tcnative-boringssl-static:${netty.tcnative.version}</libList>
                   </configuration>
                </execution>
                <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a1f9311/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8c50610..7249c2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,6 @@
       <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
       <mockito.version>2.8.47</mockito.version>
       <netty.version>4.1.24.Final</netty.version>
-      <netty.tcnative.version>2.0.7.Final</netty.tcnative.version>
       <proton.version>0.27.1</proton.version>
       <resteasy.version>3.0.19.Final</resteasy.version>
       <slf4j.version>1.7.21</slf4j.version>
@@ -542,12 +541,6 @@
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-tcnative-boringssl-static</artifactId>
-            <version>${netty.tcnative.version}</version>
-            <!-- License: Apache 2.0 -->
-         </dependency>
-         <dependency>
             <groupId>org.apache.qpid</groupId>
             <artifactId>proton-j</artifactId>
             <version>${proton.version}</version>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a1f9311/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index d1c2b33..ad27864 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -397,6 +397,12 @@
          <artifactId>jgroups</artifactId>
       </dependency>
 
+      <!-- openSSL test -->
+      <dependency>
+         <groupId>io.netty</groupId>
+         <artifactId>netty-tcnative-boringssl-static</artifactId>
+         <version>2.0.7.Final</version>
+      </dependency>
    </dependencies>
 
    <build>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a1f9311/tests/unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 5748163..3f00b6e 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -160,6 +160,12 @@
          <version>2.7.0-SNAPSHOT</version>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>io.netty</groupId>
+         <artifactId>netty-tcnative-boringssl-static</artifactId>
+         <version>2.0.7.Final</version>
+         <scope>test</scope>
+      </dependency>
 
    </dependencies>
 


Mime
View raw message