You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/06/06 20:13:40 UTC
[1/2] activemq-artemis git commit: This closes #2125
Repository: activemq-artemis
Updated Branches:
refs/heads/master 2ca271648 -> ec87cc9a3
This closes #2125
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ec87cc9a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ec87cc9a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ec87cc9a
Branch: refs/heads/master
Commit: ec87cc9a3b756f76a6492bac155e713ede9089b4
Parents: 2ca2716 b6fba64
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jun 6 16:13:31 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jun 6 16:13:31 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(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1913 Dependency to netty
tcpnative should be optional
Posted by cl...@apache.org.
ARTEMIS-1913 Dependency to netty tcpnative should be optional
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b6fba64d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b6fba64d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b6fba64d
Branch: refs/heads/master
Commit: b6fba64d9ed843160a2f45e2631737ff15e6d40f
Parents: 2ca2716
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jun 6 12:57:45 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jun 6 16:13:31 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/b6fba64d/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/b6fba64d/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/b6fba64d/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/b6fba64d/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/b6fba64d/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>