activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-1477 Add classifiers to the native transports
Date Tue, 24 Oct 2017 23:44:14 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master a4f699431 -> 5032b1ca9


ARTEMIS-1477 Add classifiers to the native transports

The changes to remove netty-all removes the classifiers that add the
dependency to the netty transport that includes the compiled native
library wrapper.  Add those classifiers back in.


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

Branch: refs/heads/master
Commit: 278b84e36cd65cc850f991da2ee4f44157517760
Parents: a4f6994
Author: Timothy Bish <tabish121@gmail.com>
Authored: Tue Oct 24 18:15:53 2017 -0400
Committer: Justin Bertram <jbertram@apache.org>
Committed: Tue Oct 24 18:43:23 2017 -0500

----------------------------------------------------------------------
 artemis-core-client/pom.xml | 6 ++++--
 pom.xml                     | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/278b84e3/artemis-core-client/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index 8220f66..06141d6 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -74,11 +74,13 @@
       </dependency>
       <dependency>
          <groupId>io.netty</groupId>
-         <artifactId>netty-transport-native-kqueue</artifactId>
+         <artifactId>netty-transport-native-epoll</artifactId>
+         <classifier>${netty-transport-native-epoll-classifier}</classifier>
       </dependency>
       <dependency>
          <groupId>io.netty</groupId>
-         <artifactId>netty-transport-native-epoll</artifactId>
+         <artifactId>netty-transport-native-kqueue</artifactId>
+         <classifier>${netty-transport-native-kqueue-classifier}</classifier>
       </dependency>
       <dependency>
          <groupId>io.netty</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/278b84e3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 886ab7a..73e39d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,9 @@
 
       <cdi-api.version>1.2</cdi-api.version>
       <geronimo-annotation_1.2_spec.version>1.0</geronimo-annotation_1.2_spec.version>
+
+      <netty-transport-native-epoll-classifier>linux-x86_64</netty-transport-native-epoll-classifier>
+      <netty-transport-native-kqueue-classifier>osx-x86_64</netty-transport-native-kqueue-classifier>
    </properties>
 
    <scm>
@@ -496,12 +499,14 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
             <version>${netty.version}</version>
+            <classifier>${netty-transport-native-epoll-classifier}</classifier>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-kqueue</artifactId>
             <version>${netty.version}</version>
+            <classifier>${netty-transport-native-kqueue-classifier}</classifier>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>


Mime
View raw message