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/08/28 16:12:09 UTC

[1/2] activemq-artemis git commit: ARTEMIS-2060 OpenSSL tests broken after Netty upgrade

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 6c4446255 -> 1e26a8a2e


ARTEMIS-2060 OpenSSL tests broken after Netty upgrade


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

Branch: refs/heads/master
Commit: ad7c0ea12da627ea9f3a34460b0723cd4ad6faf0
Parents: 6c44462
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Aug 28 11:02:27 2018 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue Aug 28 11:02:45 2018 -0500

----------------------------------------------------------------------
 examples/features/standard/netty-openssl/pom.xml | 5 ++---
 tests/integration-tests/pom.xml                  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ad7c0ea1/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 b146d28..ebd9c41 100644
--- a/examples/features/standard/netty-openssl/pom.xml
+++ b/examples/features/standard/netty-openssl/pom.xml
@@ -33,7 +33,6 @@ under the License.
 
    <properties>
       <activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
-      <netty.tcnative.version>2.0.7.Final</netty.tcnative.version>
    </properties>
 
    <dependencies>
@@ -45,7 +44,7 @@ under the License.
       <dependency>
          <groupId>io.netty</groupId>
          <artifactId>netty-tcnative-boringssl-static</artifactId>
-         <version>${netty.tcnative.version}</version>
+         <version>${netty-tcnative-version}</version>
          <!-- License: Apache 2.0 -->
       </dependency>
    </dependencies>
@@ -63,7 +62,7 @@ under the License.
                   </goals>
                   <configuration>
                      <ignore>${noServer}</ignore>
-                     <libList>io.netty:netty-tcnative-boringssl-static:${netty.tcnative.version}</libList>
+                     <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/ad7c0ea1/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index ad27864..3ab96b0 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -401,7 +401,7 @@
       <dependency>
          <groupId>io.netty</groupId>
          <artifactId>netty-tcnative-boringssl-static</artifactId>
-         <version>2.0.7.Final</version>
+         <version>${netty-tcnative-version}</version>
       </dependency>
    </dependencies>
 


[2/2] activemq-artemis git commit: This closes #2275

Posted by cl...@apache.org.
This closes #2275


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

Branch: refs/heads/master
Commit: 1e26a8a2e4af674475b05ec19bd80f8b0b67a838
Parents: 6c44462 ad7c0ea
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Aug 28 12:05:32 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Aug 28 12:05:32 2018 -0400

----------------------------------------------------------------------
 examples/features/standard/netty-openssl/pom.xml | 5 ++---
 tests/integration-tests/pom.xml                  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------