karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggrzy...@apache.org
Subject [2/2] karaf git commit: [KARAF-5345] Upgrade to activemq-client 5.15.0 and fix JmsTest
Date Thu, 07 Sep 2017 07:45:28 GMT
[KARAF-5345] Upgrade to activemq-client 5.15.0 and fix JmsTest


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/19b1c47c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/19b1c47c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/19b1c47c

Branch: refs/heads/master
Commit: 19b1c47cc7f2656153a7b765bfe6e9cc70e3d9a0
Parents: ac8080c
Author: Grzegorz Grzybek <gr.grzybek@gmail.com>
Authored: Thu Sep 7 09:44:56 2017 +0200
Committer: Grzegorz Grzybek <gr.grzybek@gmail.com>
Committed: Thu Sep 7 09:44:56 2017 +0200

----------------------------------------------------------------------
 itests/pom.xml                                                   | 4 +++-
 itests/src/test/java/org/apache/karaf/itests/JmsTest.java        | 4 +++-
 .../src/test/java/org/apache/karaf/itests/KarafTestSupport.java  | 1 +
 jms/pom.xml                                                      | 2 +-
 pom.xml                                                          | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/19b1c47c/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 44f0840..b5ebbd8 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-karaf</artifactId>
-            <version>5.14.4</version>
+            <version>${activemq.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
             <exclusions>
@@ -266,6 +266,7 @@
                         <spring41.version>${spring41.version}</spring41.version>
                         <spring42.version>${spring42.version}</spring42.version>
                         <spring43.version>${spring43.version}</spring43.version>
+                        <activemq.version>${activemq.version}</activemq.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -312,6 +313,7 @@
                                 <spring32.version>${spring32.version}</spring32.version>
                                 <spring40.version>${spring40.version}</spring40.version>
                                 <spring41.version>${spring41.version}</spring41.version>
+                                <activemq.version>${activemq.version}</activemq.version>
                     		</systemPropertyVariables>
                         </configuration>
                     </plugin>

http://git-wip-us.apache.org/repos/asf/karaf/blob/19b1c47c/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
index 417b9e5..29da7b1 100644
--- a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
@@ -51,6 +51,7 @@ public class JmsTest extends KarafTestSupport {
     private static final String JMX_QUEUE_NAME = "queueMBean";
     private MBeanServer mbeanServer;
     private ObjectName objName;
+    private String activemqVersion;
 
     @Configuration
     public Option[] config() {
@@ -68,6 +69,7 @@ public class JmsTest extends KarafTestSupport {
         await("ActiveMQ transport up").atMost(30, SECONDS).until(this::jmsTransportPresent);
         mbeanServer = ManagementFactory.getPlatformMBeanServer();
         objName = new ObjectName("org.apache.karaf:type=jms,name=root");
+        activemqVersion = System.getProperty("activemq.version");
     }
 
     @Test(timeout = 60000)
@@ -76,7 +78,7 @@ public class JmsTest extends KarafTestSupport {
         waitForConnectionFactory("name=test");
 
         assertThat(execute("jms:connectionfactories"), containsString("jms/test"));
-        assertThat(execute("jms:info test"), both(containsString("ActiveMQ")).and(containsString("5.14.4")));
+        assertThat(execute("jms:info test"), both(containsString("ActiveMQ")).and(containsString(activemqVersion)));
 
         execute("jms:send test queue message");
         assertThat(execute("jms:count test queue"), containsString("1"));

http://git-wip-us.apache.org/repos/asf/karaf/blob/19b1c47c/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
index 57648d7..34dec3d 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -217,6 +217,7 @@ public class KarafTestSupport {
             editConfigurationFilePut("etc/system.properties", "spring41.version", System.getProperty("spring41.version")),
             editConfigurationFilePut("etc/system.properties", "spring42.version", System.getProperty("spring42.version")),
             editConfigurationFilePut("etc/system.properties", "spring43.version", System.getProperty("spring43.version")),
+            editConfigurationFilePut("etc/system.properties", "activemq.version", System.getProperty("activemq.version")),
             editConfigurationFilePut("etc/branding.properties", "welcome", ""), // No welcome
banner
             editConfigurationFilePut("etc/branding-ssh.properties", "welcome", "")
         };

http://git-wip-us.apache.org/repos/asf/karaf/blob/19b1c47c/jms/pom.xml
----------------------------------------------------------------------
diff --git a/jms/pom.xml b/jms/pom.xml
index c118060..20a0926 100644
--- a/jms/pom.xml
+++ b/jms/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-pool</artifactId>
-            <version>5.9.0</version>
+            <version>${activemq.version}</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

http://git-wip-us.apache.org/repos/asf/karaf/blob/19b1c47c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c5465f5..0a7eb7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
     </prerequisites>
 
     <properties>
+        <activemq.version>5.15.0</activemq.version>
         <aopalliance.bundle.version>1.0_6</aopalliance.bundle.version>
         <aspectj.bundle.version>1.7.4_1</aspectj.bundle.version>
         <ant.bundle.version>1.9.7_1</ant.bundle.version>


Mime
View raw message