You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/07/26 08:22:27 UTC
qpid-broker-j git commit: QPID-7870: Exclude
org.objectweb.jtests.jms.conform.selector.SelectorTest from Joram test suite
for the POC client only
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 3ecdc824a -> 6b120b94a
QPID-7870: Exclude org.objectweb.jtests.jms.conform.selector.SelectorTest from Joram test suite for the POC client only
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/6b120b94
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/6b120b94
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/6b120b94
Branch: refs/heads/master
Commit: 6b120b94a0f7ee2ca47616569b1140afa819e734
Parents: 3ecdc82
Author: Keith Wall <kw...@apache.org>
Authored: Wed Jul 26 09:20:27 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Jul 26 09:22:21 2017 +0100
----------------------------------------------------------------------
joramtests/pom.xml | 5 +++-
.../test/resources/jms-client/surefire.excludes | 20 ++++++++++++++++
.../qpid-amqp-1-0-client-jms/surefire.excludes | 24 ++++++++++++++++++++
.../resources/qpid-jms-client/surefire.excludes | 20 ++++++++++++++++
4 files changed, 68 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6b120b94/joramtests/pom.xml
----------------------------------------------------------------------
diff --git a/joramtests/pom.xml b/joramtests/pom.xml
index b8a74ed..ab5343f 100644
--- a/joramtests/pom.xml
+++ b/joramtests/pom.xml
@@ -109,7 +109,7 @@
<includes>
<include>%regex[.*Test.*]</include>
</includes>
-
+ <excludesFile>${joramtests.profile-excludes}</excludesFile>
<skipTests>true</skipTests>
</configuration>
</plugin>
@@ -229,6 +229,7 @@
<properties>
<java.naming.factory.initial>org.apache.qpid.amqp_1_0.jms.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
<java.naming.provider.url>${project.build.directory}/test-classes/qpid-amqp-1-0-client-jms/jndi.properties</java.naming.provider.url>
+ <joramtests.profile-excludes>${project.build.directory}/test-classes/qpid-amqp-1-0-client-jms/surefire.excludes</joramtests.profile-excludes>
</properties>
<dependencies>
<dependency>
@@ -251,6 +252,7 @@
<properties>
<java.naming.factory.initial>org.apache.qpid.jms.jndi.JmsInitialContextFactory</java.naming.factory.initial>
<java.naming.provider.url>${project.build.directory}/test-classes/qpid-jms-client/jndi.properties</java.naming.provider.url>
+ <joramtests.profile-excludes>${project.build.directory}/test-classes/qpid-jms-client/surefire.excludes</joramtests.profile-excludes>
</properties>
<dependencies>
<dependency>
@@ -272,6 +274,7 @@
<properties>
<java.naming.factory.initial>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
<java.naming.provider.url>${project.build.directory}/test-classes/jms-client/jndi.properties</java.naming.provider.url>
+ <joramtests.profile-excludes>${project.build.directory}/test-classes/jms-client/surefire.excludes</joramtests.profile-excludes>
<qpid.amqp.version>0-9</qpid.amqp.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6b120b94/joramtests/src/test/resources/jms-client/surefire.excludes
----------------------------------------------------------------------
diff --git a/joramtests/src/test/resources/jms-client/surefire.excludes b/joramtests/src/test/resources/jms-client/surefire.excludes
new file mode 100644
index 0000000..31a82fb
--- /dev/null
+++ b/joramtests/src/test/resources/jms-client/surefire.excludes
@@ -0,0 +1,20 @@
+#
+#
+# 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.
+#
+#
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6b120b94/joramtests/src/test/resources/qpid-amqp-1-0-client-jms/surefire.excludes
----------------------------------------------------------------------
diff --git a/joramtests/src/test/resources/qpid-amqp-1-0-client-jms/surefire.excludes b/joramtests/src/test/resources/qpid-amqp-1-0-client-jms/surefire.excludes
new file mode 100644
index 0000000..947fa18
--- /dev/null
+++ b/joramtests/src/test/resources/qpid-amqp-1-0-client-jms/surefire.excludes
@@ -0,0 +1,24 @@
+#
+#
+# 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.
+#
+#
+
+# QPID-7870: SelectorTest#testSelectorExampleFromSpecs uses an JMS selector with an JMSType expression. The prototype
+# client sets the x-opt-jms-type annotation, which is not standard and as of QPID-7870 not understood by the Broker.
+org.objectweb.jtests.jms.conform.selector.SelectorTest
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6b120b94/joramtests/src/test/resources/qpid-jms-client/surefire.excludes
----------------------------------------------------------------------
diff --git a/joramtests/src/test/resources/qpid-jms-client/surefire.excludes b/joramtests/src/test/resources/qpid-jms-client/surefire.excludes
new file mode 100644
index 0000000..31a82fb
--- /dev/null
+++ b/joramtests/src/test/resources/qpid-jms-client/surefire.excludes
@@ -0,0 +1,20 @@
+#
+#
+# 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.
+#
+#
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org