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 2017/11/28 07:38:29 UTC
[3/7] qpid-broker-j git commit: QPID-6933: [System Tests] Change amqp
protocol version defined in maven profiles to be spec complient
QPID-6933: [System Tests] Change amqp protocol version defined in maven profiles to be spec complient
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/c47109b4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/c47109b4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/c47109b4
Branch: refs/heads/master
Commit: c47109b41dbeda51159ae5ce22666e5cee8eedab
Parents: 0b7666e
Author: Alex Rudyy <or...@apache.org>
Authored: Sat Nov 25 20:17:38 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Nov 28 07:37:08 2017 +0000
----------------------------------------------------------------------
pom.xml | 40 ++++++++++----------
.../qpid/test/utils/QpidBrokerTestCase.java | 2 +-
2 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c47109b4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0c0c445..d2e3087 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<profile.broker.command.windows>"${qpid.home}${file.separator}bin${file.separator}qpid-server.bat" -sp "${at.sign}STORE_PATH" -st ${at.sign}STORE_TYPE -prop test.port=${at.sign}PORT -prop "qpid.work_dir=${at.sign}QPID_WORK"</profile.broker.command.windows>
<profile.test.excludes>Excludes JavaExcludes ${profile}.excludes ${profile.specific.excludes}</profile.test.excludes>
<profile.specific.excludes>JavaTransientExcludes Java010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_10</profile.broker.version>
+ <profile.broker.version>1.0</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
@@ -1007,7 +1007,7 @@
<properties>
<profile>java-mms.0-10</profile>
<profile.specific.excludes>JavaTransientExcludes Java010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_10</profile.broker.version>
+ <profile.broker.version>0-10</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
@@ -1027,7 +1027,7 @@
<properties>
<profile>java-mms.0-9-1</profile>
<profile.specific.excludes>JavaTransientExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_9_1</profile.broker.version>
+ <profile.broker.version>0-9-1</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
@@ -1047,7 +1047,7 @@
<properties>
<profile>java-mms.0-9</profile>
<profile.specific.excludes>JavaTransientExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_9</profile.broker.version>
+ <profile.broker.version>0-9</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
@@ -1067,7 +1067,7 @@
<properties>
<profile>java-bdb.0-10</profile>
<profile.specific.excludes>JavaPersistentExcludes Java010Excludes JavaBDBExcludes</profile.specific.excludes>
- <profile.broker.version>v0_10</profile.broker.version>
+ <profile.broker.version>0-10</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
@@ -1086,7 +1086,7 @@
<properties>
<profile>java-bdb.0-9-1</profile>
<profile.specific.excludes>JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes</profile.specific.excludes>
- <profile.broker.version>v0_9_1</profile.broker.version>
+ <profile.broker.version>0-9-1</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
@@ -1105,7 +1105,7 @@
<properties>
<profile>java-bdb.0-9</profile>
<profile.specific.excludes>JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes</profile.specific.excludes>
- <profile.broker.version>v0_9</profile.broker.version>
+ <profile.broker.version>0-9</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
@@ -1124,7 +1124,7 @@
<properties>
<profile>java-dby-mem.0-10</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes Java010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_10</profile.broker.version>
+ <profile.broker.version>0-10</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
@@ -1143,7 +1143,7 @@
<properties>
<profile>java-dby-mem.0-9-1</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_9_1</profile.broker.version>
+ <profile.broker.version>0-9-1</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
@@ -1162,7 +1162,7 @@
<properties>
<profile>java-dby-mem.0-9</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_9</profile.broker.version>
+ <profile.broker.version>0-9</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
@@ -1181,7 +1181,7 @@
<properties>
<profile>java-dby.0-10</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes Java010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_10</profile.broker.version>
+ <profile.broker.version>0-10</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
@@ -1201,7 +1201,7 @@
<properties>
<profile>java-dby.0-9-1</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_9_1</profile.broker.version>
+ <profile.broker.version>0-9-1</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
@@ -1221,7 +1221,7 @@
<properties>
<profile>java-dby.0-9</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_9</profile.broker.version>
+ <profile.broker.version>0-9</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
@@ -1242,7 +1242,7 @@
<properties>
<profile>java-mms.1-0</profile>
<profile.specific.excludes>JavaTransientExcludes Java10Excludes Java10BrokenTestsExcludes Java10UninvestigatedTestsExcludes</profile.specific.excludes>
- <profile.broker.version>v1_0</profile.broker.version>
+ <profile.broker.version>1.0</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10","AMQP_1_0"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
@@ -1264,7 +1264,7 @@
<properties>
<profile>java-bdb.1-0</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaBDBExcludes Java10Excludes Java10BrokenTestsExcludes Java10UninvestigatedTestsExcludes</profile.specific.excludes>
- <profile.broker.version>v1_0</profile.broker.version>
+ <profile.broker.version>1.0</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
@@ -1285,7 +1285,7 @@
<properties>
<profile>java-dby.1-0</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes Java10Excludes Java10BrokenTestsExcludes Java10UninvestigatedTestsExcludes</profile.specific.excludes>
- <profile.broker.version>v1_0</profile.broker.version>
+ <profile.broker.version>1.0</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
@@ -1311,7 +1311,7 @@
<properties>
<profile>java-json.1-0</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes Java10Excludes Java10BrokenTestsExcludes Java10UninvestigatedTestsExcludes</profile.specific.excludes>
- <profile.broker.version>v1_0</profile.broker.version>
+ <profile.broker.version>1.0</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
@@ -1331,7 +1331,7 @@
<properties>
<profile>java-json.0-9-1</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes XAExcludes JavaPre010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_9_1</profile.broker.version>
+ <profile.broker.version>0-9-1</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
@@ -1350,7 +1350,7 @@
<properties>
<profile>java-json.0-10</profile>
<profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes XAExcludes Java010Excludes</profile.specific.excludes>
- <profile.broker.version>v0_10</profile.broker.version>
+ <profile.broker.version>0-10</profile.broker.version>
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
@@ -1380,7 +1380,7 @@
<profile.broker.command.windows />
<profile.test.excludes>Excludes CPPExcludes ${profile}.excludes ${profile.specific.excludes} cpp.excludes</profile.test.excludes>
<profile.specific.excludes>CPPPrefetchExcludes CPPTransientExcludes</profile.specific.excludes>
- <profile.broker.version>v0_10</profile.broker.version>
+ <profile.broker.version>0-10</profile.broker.version>
<profile.broker.persistent>false</profile.broker.persistent>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c47109b4/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
----------------------------------------------------------------------
diff --git a/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 6a9b6a0..4aec884 100755
--- a/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -73,7 +73,7 @@ public class QpidBrokerTestCase extends QpidTestCase
private static final Boolean BROKER_CLEAN_BETWEEN_TESTS = Boolean.getBoolean("broker.clean.between.tests");
private static final Boolean BROKER_PERSISTENT = Boolean.getBoolean("broker.persistent");
private static final Protocol BROKER_PROTOCOL =
- Protocol.valueOf("AMQP_" + System.getProperty("broker.version", "v0_9").substring(1));
+ Protocol.valueOf("AMQP_" + System.getProperty("broker.version", "0-9-1").replace('-', '_').replace('.', '_'));
private static List<BrokerHolder> _brokerList = new ArrayList<>();
private final Map<String, String> _propertiesSetForBroker = new HashMap<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org