Author: chirino
Date: Fri Nov 9 17:04:57 2012
New Revision: 1407544
URL: http://svn.apache.org/viewvc?rev=1407544&view=rev
Log:
Revert the last change.
Modified:
activemq/trunk/activemq-core/pom.xml
Modified: activemq/trunk/activemq-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1407544&r1=1407543&r2=1407544&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Fri Nov 9 17:04:57 2012
@@ -601,9 +601,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes combine.children="append">
- <!-- These are performance tests so take too
long to run -->
+ <!-- These are performance tests and take too
long to run -->
<exclude>**/perf/*</exclude>
- <!-- These are load tests so take too long to
run -->
+ <!-- These are load tests and take too long to
run -->
<exclude>**/load/*</exclude>
</excludes>
</configuration>
@@ -611,14 +611,12 @@
</plugins>
</build>
</profile>
- <!-- Apache CI builds enable this profile to avoid testing known
failing cases -->
<profile>
- <id>activemq.tests-exclude-broken</id>
+ <id>activemq.exclude-broken-tests</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>activemq.tests</name>
- <value>exclude-broken</value>
</property>
</activation>
<build>
@@ -627,63 +625,58 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes combine.children="append">
- <!-- These are performance tests so take too
long to run -->
- <exclude>**/perf/*</exclude>
- <!-- These are load tests so take too long to
run -->
- <exclude>**/load/*</exclude>
-
- <!--<!–
http://jira.activemq.org/jira/browse/AMQ-626 –>-->
-
<!--<exclude>**/MultipleTestsWithSpringFactoryBeanTest.*</exclude>-->
-
<!--<exclude>**/MultipleTestsWithXBeanFactoryBeanTest.*</exclude>-->
-
<!--<exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>-->
-
- <!--<!– Multicast and UDP based tests
fail on GBuild –>-->
-
<!--<exclude>**/PeerTransportTest.*</exclude>-->
-
<!--<exclude>**/MulticastTransportTest.*</exclude>-->
-
<!--<exclude>**/MulticastNetworkTest.*</exclude>-->
-
<!--<exclude>**/UnreliableUdpTransportTest.*</exclude>-->
-
<!--<exclude>**/SslTransportBrokerTest.*</exclude>-->
-
- <!--<!– this one is a little flaky
and can fail on some platforms randomly –>-->
-
<!--<exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>-->
-
<!--<exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>-->
-
<!--<exclude>**/ZeroconfDiscoverTransportTest.*</exclude>-->
-
- <!--<!– m2 tests failing since move
from assembly –>-->
-
<!--<exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>-->
-
<!--<exclude>**/TwoBrokerMulticastQueueTest.*</exclude>-->
-
- <!--<!– This test only works on
machines which have ssh propertly configured –>-->
-
<!--<exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>-->
-
- <!--<!–
http://issues.apache.org/activemq/browse/AMQ-1027 –>-->
-
<!--<exclude>**/FailoverConsumerTest.*</exclude>-->
-
- <!--<!– The NIO implemenation is not
working properly on OS X.. –>-->
- <!--<exclude>**/nio/**</exclude>-->
-
<!--<exclude>**/NioQueueSubscriptionTest.*/</exclude>-->
-
- <!--<!– A test used for memory
profiling only. –>-->
-
<!--<exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>-->
-
- <!--<!– used just to test potential
memory leaks manually –>-->
- <!--<exclude>**/JDBCTestMemory.*</exclude>-->
-
- <!--<exclude>**/amq1490/*</exclude>-->
- <!--<exclude>**/archive/*</exclude>-->
-
<!--<exclude>**/NetworkFailoverTest.*/**</exclude>-->
-
-
<!--<exclude>**/vm/VMTransportBrokerTest.*</exclude>-->
-
<!--<exclude>**/broker/MarshallingBrokerTest.*</exclude>-->
-
- <!--<exclude>**/AMQDeadlockTest3.*</exclude>-->
-
- <!--<!–
https://issues.apache.org/activemq/browse/AMQ-2050 –>-->
-
<!--<exclude>**/ProxyConnectorTest.*</exclude>-->
-
- <!--<!– breaks hudson: disable till
we get a chance to give it the time that it needs -
http://hudson.zones.apache.org/hudson/job/ActiveMQ/org.apache.activemq$activemq-core/199/testReport/org.apache.activemq.network/BrokerNetworkWithStuckMessagesTest/testBrokerNetworkWithStuckMessages/
–>-->
-
<!--<exclude>**/BrokerNetworkWithStuckMessagesTest.*</exclude>-->
- <!--<exclude>**/DoSTest.*</exclude>-->
+ <!--
http://jira.activemq.org/jira/browse/AMQ-626 -->
+
<exclude>**/MultipleTestsWithSpringFactoryBeanTest.*</exclude>
+
<exclude>**/MultipleTestsWithXBeanFactoryBeanTest.*</exclude>
+
<exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>
+
+ <!-- Multicast and UDP based tests fail on
GBuild -->
+ <exclude>**/PeerTransportTest.*</exclude>
+ <exclude>**/MulticastTransportTest.*</exclude>
+ <exclude>**/MulticastNetworkTest.*</exclude>
+
<exclude>**/UnreliableUdpTransportTest.*</exclude>
+ <exclude>**/SslTransportBrokerTest.*</exclude>
+
+ <!-- this one is a little flaky and can fail
on some platforms randomly -->
+
<exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>
+
<exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>
+
<exclude>**/ZeroconfDiscoverTransportTest.*</exclude>
+
+ <!-- m2 tests failing since move from assembly
-->
+
<exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
+
<exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
+
+ <!-- This test only works on machines which
have ssh propertly configured -->
+
<exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
+
+ <!--
http://issues.apache.org/activemq/browse/AMQ-1027 -->
+ <exclude>**/FailoverConsumerTest.*</exclude>
+
+ <!-- The NIO implemenation is not working
properly on OS X.. -->
+ <exclude>**/nio/**</exclude>
+
<exclude>**/NioQueueSubscriptionTest.*/</exclude>
+
+ <!-- A test used for memory profiling only. -->
+
<exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>
+
+ <!-- used just to test potential memory leaks
manually -->
+ <exclude>**/JDBCTestMemory.*</exclude>
+
+ <exclude>**/amq1490/*</exclude>
+ <exclude>**/archive/*</exclude>
+ <exclude>**/NetworkFailoverTest.*/**</exclude>
+
+
<exclude>**/vm/VMTransportBrokerTest.*</exclude>
+
<exclude>**/broker/MarshallingBrokerTest.*</exclude>
+
+ <exclude>**/AMQDeadlockTest3.*</exclude>
+
+ <!--
https://issues.apache.org/activemq/browse/AMQ-2050 -->
+ <exclude>**/ProxyConnectorTest.*</exclude>
+
+ <!-- breaks hudson: disable till we get a
chance to give it the time that it needs -
http://hudson.zones.apache.org/hudson/job/ActiveMQ/org.apache.activemq$activemq-core/199/testReport/org.apache.activemq.network/BrokerNetworkWithStuckMessagesTest/testBrokerNetworkWithStuckMessages/
-->
+
<exclude>**/BrokerNetworkWithStuckMessagesTest.*</exclude>
+ <exclude>**/DoSTest.*</exclude>
</excludes>
</configuration>
@@ -702,18 +695,16 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes combine.children="append">
-
<exclude>**/perf/SimpleDurableTopicTest.*</exclude>
+ <!-- These are performance tests and take too
long to run -->
+ <exclude>**/perf/*</exclude>
+ <!-- These are load tests and take too long to
run -->
+ <exclude>**/load/*</exclude>
+
<!-- These tests run too slow to execute as
part of the unit tests -->
<exclude>**/TransactionNotStartedErrorTest.*</exclude>
<exclude>**/DefaultStoreBrokerTest.*</exclude>
<exclude>**/TcpTransportBrokerTest.*</exclude>
- <!-- These are performance tests so take too
long to run -->
- <exclude>**/perf/*</exclude>
-
- <!-- These are load tests so take too long to
run -->
- <exclude>**/load/*</exclude>
-
<!-- Don't run the openwire encoding tests
since the test and impls are code generated -->
<exclude>org/apache/activemq/openwire/v*/**</exclude>
