You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/04/13 12:49:37 UTC

[1/3] qpid-broker-j git commit: QPID-8158: [Broker-J] [System Tests] Fix issue with creation of folder test.output.dir_UNDEFINED by logback when variable test.output.dir is not defined

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 2443fe648 -> 440824f39


QPID-8158: [Broker-J] [System Tests] Fix issue with creation of folder test.output.dir_UNDEFINED by logback when variable test.output.dir is not defined


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/440824f3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/440824f3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/440824f3

Branch: refs/heads/master
Commit: 440824f39d6bab4aa90706db0cceb25ddc7252da
Parents: c2cdab1
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Apr 13 13:35:49 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Apr 13 13:49:30 2018 +0100

----------------------------------------------------------------------
 qpid-test-utils/src/main/resources/logback.xml  |  2 +-
 .../qpid/systests/admin/SpawnBrokerAdmin.java   |  3 ++-
 .../main/resources/default-broker-logback.xml   | 24 ++++++++++++++++++++
 .../systests/admin/SpawnBrokerAdminTest.java    | 22 ++++++++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/440824f3/qpid-test-utils/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/qpid-test-utils/src/main/resources/logback.xml b/qpid-test-utils/src/main/resources/logback.xml
index 9e188f5..c311b2a 100644
--- a/qpid-test-utils/src/main/resources/logback.xml
+++ b/qpid-test-utils/src/main/resources/logback.xml
@@ -29,7 +29,7 @@
         </discriminator>
         <sift>
             <appender name="FILE-${classQualifiedTestName}" class="ch.qos.logback.core.FileAppender">
-                <File>${test.output.dir}${file.separator}TEST-${classQualifiedTestName}.txt</File>
+                <File>${test.output.dir:-target${file.separator}surefire-reports}${file.separator}TEST-${classQualifiedTestName}.txt</File>
                 <Append>False</Append>
                 <encoder>
                     <pattern>%date %-5level [%thread] %logger{10} %msg%n</pattern>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/440824f3/systests/qpid-systests-spawn-admin/src/main/java/org/apache/qpid/systests/admin/SpawnBrokerAdmin.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-spawn-admin/src/main/java/org/apache/qpid/systests/admin/SpawnBrokerAdmin.java b/systests/qpid-systests-spawn-admin/src/main/java/org/apache/qpid/systests/admin/SpawnBrokerAdmin.java
index 350a431..353dd0e 100644
--- a/systests/qpid-systests-spawn-admin/src/main/java/org/apache/qpid/systests/admin/SpawnBrokerAdmin.java
+++ b/systests/qpid-systests-spawn-admin/src/main/java/org/apache/qpid/systests/admin/SpawnBrokerAdmin.java
@@ -85,7 +85,7 @@ public class SpawnBrokerAdmin implements BrokerAdmin, Closeable
     private static final String SYSTEST_PROPERTY_VIRTUALHOSTNODE_TYPE = "virtualhostnode.type";
     private static final String SYSTEST_PROPERTY_VIRTUALHOST_BLUEPRINT = "virtualhostnode.context.blueprint";
     private static final String SYSTEST_PROPERTY_INITIAL_CONFIGURATION_LOCATION = "qpid.initialConfigurationLocation";
-    private static final String SYSTEST_PROPERTY_BUILD_CLASSPATH_FILE = "qpid.systests.build.classpath.file";
+    static final String SYSTEST_PROPERTY_BUILD_CLASSPATH_FILE = "qpid.systests.build.classpath.file";
     private static final String AMQP_QUEUE_TYPE = "org.apache.qpid.Queue";
     private static final String AMQP_NODE_TYPE = "org.apache.qpid.VirtualHostNode";
     private static final String AMQP_VIRTUAL_HOST_TYPE = "org.apache.qpid.VirtualHost";
@@ -735,6 +735,7 @@ public class SpawnBrokerAdmin implements BrokerAdmin, Closeable
         jvmArguments.add("-cp");
         jvmArguments.add(classpath);
         jvmArguments.add("-Djava.io.tmpdir=" + escape(System.getProperty("java.io.tmpdir")));
+        jvmArguments.add("-Dlogback.configurationFile=default-broker-logback.xml");
         jvmArguments.add("-Dqpid.tests.mms.messagestore.persistence=true");
         jvmArguments.add("org.apache.qpid.server.Main");
         jvmArguments.add("--store-type");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/440824f3/systests/qpid-systests-spawn-admin/src/main/resources/default-broker-logback.xml
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-spawn-admin/src/main/resources/default-broker-logback.xml b/systests/qpid-systests-spawn-admin/src/main/resources/default-broker-logback.xml
new file mode 100644
index 0000000..e489e54
--- /dev/null
+++ b/systests/qpid-systests-spawn-admin/src/main/resources/default-broker-logback.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  ~
+  -->
+<configuration off="true">
+    <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
+    <root level="off"/>
+</configuration>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/440824f3/systests/qpid-systests-spawn-admin/src/test/java/org/apache/qpid/systests/admin/SpawnBrokerAdminTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-spawn-admin/src/test/java/org/apache/qpid/systests/admin/SpawnBrokerAdminTest.java b/systests/qpid-systests-spawn-admin/src/test/java/org/apache/qpid/systests/admin/SpawnBrokerAdminTest.java
index b6b4ebb..c6a9164 100644
--- a/systests/qpid-systests-spawn-admin/src/test/java/org/apache/qpid/systests/admin/SpawnBrokerAdminTest.java
+++ b/systests/qpid-systests-spawn-admin/src/test/java/org/apache/qpid/systests/admin/SpawnBrokerAdminTest.java
@@ -20,8 +20,11 @@
  */
 package org.apache.qpid.systests.admin;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.StandardOpenOption.APPEND;
 import static org.apache.qpid.systests.Utils.getJmsProvider;
 import static org.apache.qpid.systests.Utils.getReceiveTimeout;
+import static org.apache.qpid.systests.admin.SpawnBrokerAdmin.SYSTEST_PROPERTY_BUILD_CLASSPATH_FILE;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
@@ -30,7 +33,11 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeThat;
 
+import java.io.File;
+import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.nio.file.Files;
+import java.util.Arrays;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -42,6 +49,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import org.apache.qpid.systests.AmqpManagementFacade;
@@ -51,6 +59,20 @@ import org.apache.qpid.tests.utils.BrokerAdmin;
 public class SpawnBrokerAdminTest extends UnitTestBase
 {
 
+    @BeforeClass
+    public static void appendLocalClassPath() throws Exception
+    {
+        String file = System.getProperty(SYSTEST_PROPERTY_BUILD_CLASSPATH_FILE);
+
+        // append test classpath in order to locate logback configuration for spawn broker
+        final String appendedClasspath = System.getProperty("path.separator")
+                                         + System.getProperty("java.class.path");
+        Files.write(new File(file).toPath(),
+                    appendedClasspath.getBytes(UTF_8),
+                    APPEND);
+    }
+
+
     @Test
     public void beforeTestClass() throws Exception
     {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[2/3] qpid-broker-j git commit: QPID-8158: [Broker-J] [System Tests] Update README and cleanup legacy settings

Posted by or...@apache.org.
QPID-8158: [Broker-J] [System Tests] Update README and cleanup legacy settings


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/c2cdab1e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/c2cdab1e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/c2cdab1e

Branch: refs/heads/master
Commit: c2cdab1ea2689066eb4736309cfe2db0dc078fec
Parents: bc671f5
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Apr 13 11:59:02 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Apr 13 13:49:30 2018 +0100

----------------------------------------------------------------------
 README.md                                          |  5 +++++
 pom.xml                                            |  6 ------
 systests/end-to-end-conversion-tests/pom.xml       |  6 ++++++
 .../systests/QpidJmsClient0xConnectionBuilder.java | 17 +----------------
 .../systests/QpidJmsClientConnectionBuilder.java   | 13 -------------
 5 files changed, 12 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6020d03..d07a7a5 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,11 @@ Perform a subset of tests on the packaged release artifacts without installing:
 
     mvn verify -Dtest=TestNamePattern* -DfailIfNoTests=false
 
+Integration tests except for protocol tests are disabled by default.
+In order to run all integration tests, they need to be enabled with a flag -DskipITs=false, for example
+
+    mvn verify -DskipITs=false
+
 Execute the tests and produce code coverage report:
 
     mvn clean test jacoco:report

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 93930d3..34855a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -779,12 +779,6 @@
             <!-- Defaults -->
             <qpid.dest_syntax>BURL</qpid.dest_syntax>
 
-            <test.port>0</test.port>
-            <test.hport>0</test.hport>
-            <test.port.ssl>0</test.port.ssl>
-            <test.port.alt>0</test.port.alt>
-            <test.port.alt.ssl>0</test.port.alt.ssl>
-
             <!-- Profile Based Values -->
             <profile>${profile}</profile>
             <broker.version>${profile.broker.version}</broker.version>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/systests/end-to-end-conversion-tests/pom.xml
----------------------------------------------------------------------
diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml
index 3979fa4..42a1a7d 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -94,6 +94,7 @@
                     <execution>
                         <id>0-9-1 -&gt; 1.0</id>
                         <configuration>
+                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>0-9-1_to_1.0</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -109,6 +110,7 @@
                     <execution>
                         <id>1.0 -&gt; 0-9-1</id>
                         <configuration>
+                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>1.0_to_0-9-1</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -124,6 +126,7 @@
                     <execution>
                         <id>0-10 -&gt; 1.0</id>
                         <configuration>
+                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>0-10_to_1.0</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -139,6 +142,7 @@
                     <execution>
                         <id>1.0 -&gt; 0-10</id>
                         <configuration>
+                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>1.0_to_0-10</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -154,6 +158,7 @@
                     <execution>
                         <id>0-9-1 -&gt; 0-10</id>
                         <configuration>
+                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>0-9-1_to_0-10</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -169,6 +174,7 @@
                     <execution>
                         <id>0-10 -&gt; 0-9-1</id>
                         <configuration>
+                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>0-10_to_0-9-1</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
index b9590f6..914cbe8 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
@@ -333,22 +333,7 @@ public class QpidJmsClient0xConnectionBuilder implements ConnectionBuilder
 
         if (_enableFailover)
         {
-            if (_failoverPorts.isEmpty())
-            {
-                Integer testPortAlt;
-                if ((testPortAlt = Integer.getInteger("test.port.alt")) != null)
-                {
-                    copy.add(testPortAlt);
-                }
-                else if (_enableTls && (testPortAlt = Integer.getInteger("test.port.alt.ssl")) != null)
-                {
-                    copy.add(testPortAlt);
-                }
-            }
-            else
-            {
-                copy.addAll(_failoverPorts);
-            }
+            copy.addAll(_failoverPorts);
         }
 
         final String transportQuery = buildTransportQuery();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
index b5cb304..551ba20 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
@@ -331,19 +331,6 @@ public class QpidJmsClientConnectionBuilder implements ConnectionBuilder
 
             final List<Integer> copy = new ArrayList<>(_failoverPorts.size() + 1);
             copy.add(_enableTls ? _sslPort : _port);
-
-            if (_failoverPorts.isEmpty())
-            {
-                Integer testPortAlt;
-                if ((testPortAlt = Integer.getInteger("test.port.alt")) != null)
-                {
-                    copy.add(testPortAlt);
-                }
-                else if (_enableTls && (testPortAlt = Integer.getInteger("test.port.alt.ssl")) != null)
-                {
-                    copy.add(testPortAlt);
-                }
-            }
             copy.addAll(_failoverPorts);
 
             final String failover = copy.stream()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[3/3] qpid-broker-j git commit: Revert "QPID-8158: [Broker-J] [System Tests] Run protocol tests as part of unit tests"

Posted by or...@apache.org.
Revert "QPID-8158: [Broker-J] [System Tests] Run protocol tests as part of unit tests"

This reverts commit b91ddb20ecd3b3178072ef39c08f47cf5ceb7e29.


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/bc671f5f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/bc671f5f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/bc671f5f

Branch: refs/heads/master
Commit: bc671f5fded7da402d3fdbe8af3f911aa303baa9
Parents: 2443fe6
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Apr 13 11:20:48 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Apr 13 13:49:30 2018 +0100

----------------------------------------------------------------------
 qpid-systests-parent/pom.xml                 | 2 +-
 systests/end-to-end-conversion-tests/pom.xml | 7 +------
 systests/protocol-tests-amqp-0-10/pom.xml    | 3 +--
 systests/protocol-tests-amqp-0-8/pom.xml     | 3 +--
 systests/protocol-tests-amqp-1-0/pom.xml     | 3 +--
 5 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bc671f5f/qpid-systests-parent/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml
index 3045799..6fb8b0d 100644
--- a/qpid-systests-parent/pom.xml
+++ b/qpid-systests-parent/pom.xml
@@ -31,7 +31,7 @@
   <description>Parent POM for Qpid system testing modules</description>
 
   <properties>
-    <skipITs>${skipTests}</skipITs>
+    <skipITs>true</skipITs>
   </properties>
 
   <dependencies>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bc671f5f/systests/end-to-end-conversion-tests/pom.xml
----------------------------------------------------------------------
diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml
index 76da773..3979fa4 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -82,6 +82,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <skipTests>${skipITs}</skipTests>
                     <workingDirectory>${project.basedir}</workingDirectory>
                     <systemPropertyVariables>
                         <qpid.initialConfigurationLocation>classpath:config-end-to-end-conversion-tests.json</qpid.initialConfigurationLocation>
@@ -93,7 +94,6 @@
                     <execution>
                         <id>0-9-1 -&gt; 1.0</id>
                         <configuration>
-                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>0-9-1_to_1.0</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -109,7 +109,6 @@
                     <execution>
                         <id>1.0 -&gt; 0-9-1</id>
                         <configuration>
-                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>1.0_to_0-9-1</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -125,7 +124,6 @@
                     <execution>
                         <id>0-10 -&gt; 1.0</id>
                         <configuration>
-                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>0-10_to_1.0</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -141,7 +139,6 @@
                     <execution>
                         <id>1.0 -&gt; 0-10</id>
                         <configuration>
-                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>1.0_to_0-10</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -157,7 +154,6 @@
                     <execution>
                         <id>0-9-1 -&gt; 0-10</id>
                         <configuration>
-                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>0-9-1_to_0-10</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
@@ -173,7 +169,6 @@
                     <execution>
                         <id>0-10 -&gt; 0-9-1</id>
                         <configuration>
-                            <skipTests>${skipITs}</skipTests>
                             <systemPropertyVariables>
                                 <qpid.systests.end_to_end_conversion.executionId>0-10_to_0-9-1</qpid.systests.end_to_end_conversion.executionId>
                                 <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bc671f5f/systests/protocol-tests-amqp-0-10/pom.xml
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-0-10/pom.xml b/systests/protocol-tests-amqp-0-10/pom.xml
index 0d0cfe0..53b049e 100644
--- a/systests/protocol-tests-amqp-0-10/pom.xml
+++ b/systests/protocol-tests-amqp-0-10/pom.xml
@@ -101,7 +101,6 @@
                     <systemPropertyVariables>
                         <qpid.initialConfigurationLocation>classpath:config-protocol-tests-0-10.json</qpid.initialConfigurationLocation>
                     </systemPropertyVariables>
-                    <skipTests>${skipTests}</skipTests>
                 </configuration>
                 <executions>
                     <execution>
@@ -111,7 +110,7 @@
                             <goal>test</goal>
                         </goals>
                         <configuration>
-                            <skipTests>true</skipTests>
+                            <skipTests>${skipTests}</skipTests>
                         </configuration>
                     </execution>
                 </executions>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bc671f5f/systests/protocol-tests-amqp-0-8/pom.xml
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-0-8/pom.xml b/systests/protocol-tests-amqp-0-8/pom.xml
index afe51e5..4a99449 100644
--- a/systests/protocol-tests-amqp-0-8/pom.xml
+++ b/systests/protocol-tests-amqp-0-8/pom.xml
@@ -101,7 +101,6 @@
                     <systemPropertyVariables>
                         <qpid.initialConfigurationLocation>classpath:config-protocol-tests-0-8.json</qpid.initialConfigurationLocation>
                     </systemPropertyVariables>
-                    <skipTests>${skipTests}</skipTests>
                 </configuration>
                 <executions>
                     <execution>
@@ -111,7 +110,7 @@
                             <goal>test</goal>
                         </goals>
                         <configuration>
-                            <skipTests>true</skipTests>
+                            <skipTests>${skipTests}</skipTests>
                         </configuration>
                     </execution>
                 </executions>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bc671f5f/systests/protocol-tests-amqp-1-0/pom.xml
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/pom.xml b/systests/protocol-tests-amqp-1-0/pom.xml
index 8cbaff9..5cc7856 100644
--- a/systests/protocol-tests-amqp-1-0/pom.xml
+++ b/systests/protocol-tests-amqp-1-0/pom.xml
@@ -121,7 +121,6 @@
                     <systemPropertyVariables>
                         <qpid.initialConfigurationLocation>classpath:config-protocol-tests.json</qpid.initialConfigurationLocation>
                     </systemPropertyVariables>
-                    <skipTests>${skipTests}</skipTests>
                 </configuration>
                 <executions>
                     <execution>
@@ -131,7 +130,7 @@
                             <goal>test</goal>
                         </goals>
                         <configuration>
-                            <skipTests>true</skipTests>
+                            <skipTests>${skipTests}</skipTests>
                         </configuration>
                     </execution>
                 </executions>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org