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 <oru...@apache.org> Authored: Fri Apr 13 11:20:48 2018 +0100 Committer: Alex Rudyy <oru...@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 -> 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 -> 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 -> 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 -> 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 -> 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 -> 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-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
