Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1913 Dependency to netty tcpnative should be optional

This commit is contained in:
Clebert Suconic 2018-06-06 12:57:45 -04:00
parent 2ca271648d
commit b6fba64d9e
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-core-client/pom.xml
View File

@ -118,11 +118,6 @@
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-common</artifactId> <artifactId>netty-common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>

8
examples/features/standard/netty-openssl/pom.xml
View File

@ -33,6 +33,7 @@ under the License.
<properties> <properties>
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir> <activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
<netty.tcnative.version>2.0.7.Final</netty.tcnative.version>
</properties> </properties>
<dependencies> <dependencies>
@ -41,6 +42,12 @@ under the License.
<artifactId>artemis-jms-client-all</artifactId> <artifactId>artemis-jms-client-all</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${netty.tcnative.version}</version>
<!-- License: Apache 2.0 -->
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -56,6 +63,7 @@ under the License.
</goals> </goals>
<configuration> <configuration>
<ignore>${noServer}</ignore> <ignore>${noServer}</ignore>
<libList>io.netty:netty-tcnative-boringssl-static:${netty.tcnative.version}</libList>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>

7
pom.xml
View File

@ -92,7 +92,6 @@
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version> <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<mockito.version>2.8.47</mockito.version> <mockito.version>2.8.47</mockito.version>
<netty.version>4.1.24.Final</netty.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> <proton.version>0.27.1</proton.version>
<resteasy.version>3.0.19.Final</resteasy.version> <resteasy.version>3.0.19.Final</resteasy.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>
@ -541,12 +540,6 @@
<version>${netty.version}</version> <version>${netty.version}</version>
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${netty.tcnative.version}</version>
<!-- License: Apache 2.0 -->
</dependency>
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>
<artifactId>proton-j</artifactId> <artifactId>proton-j</artifactId>

6
tests/integration-tests/pom.xml
View File

@ -397,6 +397,12 @@
<artifactId>jgroups</artifactId> <artifactId>jgroups</artifactId>
</dependency> </dependency>
<!-- openSSL test -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.7.Final</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

6
tests/unit-tests/pom.xml
View File

@ -160,6 +160,12 @@
<version>2.7.0-SNAPSHOT</version> <version>2.7.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.7.Final</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>