Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert the last change. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407544 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2012-11-09 17:04:57 +00:00
parent 9a00637622
commit 0729dd88d6
1 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
activemq-core/pom.xml
View File

@ -601,9 +601,9 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<excludes combine.children="append"> <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> <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> <exclude>**/load/*</exclude>
</excludes> </excludes>
</configuration> </configuration>
@ -611,14 +611,12 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<!-- Apache CI builds enable this profile to avoid testing known failing cases -->
<profile> <profile>
<id>activemq.tests-exclude-broken</id> <id>activemq.exclude-broken-tests</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
<property> <property>
<name>activemq.tests</name> <name>activemq.tests</name>
<value>exclude-broken</value>
</property> </property>
</activation> </activation>
<build> <build>
@ -627,63 +625,58 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<excludes combine.children="append"> <excludes combine.children="append">
<!-- These are performance tests so take too long to run --> <!-- http://jira.activemq.org/jira/browse/AMQ-626 -->
<exclude>**/perf/*</exclude> <exclude>**/MultipleTestsWithSpringFactoryBeanTest.*</exclude>
<!-- These are load tests so take too long to run --> <exclude>**/MultipleTestsWithXBeanFactoryBeanTest.*</exclude>
<exclude>**/load/*</exclude> <exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>
<!--&lt;!&ndash; http://jira.activemq.org/jira/browse/AMQ-626 &ndash;&gt;--> <!-- Multicast and UDP based tests fail on GBuild -->
<!--<exclude>**/MultipleTestsWithSpringFactoryBeanTest.*</exclude>--> <exclude>**/PeerTransportTest.*</exclude>
<!--<exclude>**/MultipleTestsWithXBeanFactoryBeanTest.*</exclude>--> <exclude>**/MulticastTransportTest.*</exclude>
<!--<exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>--> <exclude>**/MulticastNetworkTest.*</exclude>
<exclude>**/UnreliableUdpTransportTest.*</exclude>
<exclude>**/SslTransportBrokerTest.*</exclude>
<!--&lt;!&ndash; Multicast and UDP based tests fail on GBuild &ndash;&gt;--> <!-- this one is a little flaky and can fail on some platforms randomly -->
<!--<exclude>**/PeerTransportTest.*</exclude>--> <exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>
<!--<exclude>**/MulticastTransportTest.*</exclude>--> <exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>
<!--<exclude>**/MulticastNetworkTest.*</exclude>--> <exclude>**/ZeroconfDiscoverTransportTest.*</exclude>
<!--<exclude>**/UnreliableUdpTransportTest.*</exclude>-->
<!--<exclude>**/SslTransportBrokerTest.*</exclude>-->
<!--&lt;!&ndash; this one is a little flaky and can fail on some platforms randomly &ndash;&gt;--> <!-- m2 tests failing since move from assembly -->
<!--<exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>--> <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
<!--<exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>--> <exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
<!--<exclude>**/ZeroconfDiscoverTransportTest.*</exclude>-->
<!--&lt;!&ndash; m2 tests failing since move from assembly &ndash;&gt;--> <!-- This test only works on machines which have ssh propertly configured -->
<!--<exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>--> <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
<!--<exclude>**/TwoBrokerMulticastQueueTest.*</exclude>-->
<!--&lt;!&ndash; This test only works on machines which have ssh propertly configured &ndash;&gt;--> <!-- http://issues.apache.org/activemq/browse/AMQ-1027 -->
<!--<exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>--> <exclude>**/FailoverConsumerTest.*</exclude>
<!--&lt;!&ndash; http://issues.apache.org/activemq/browse/AMQ-1027 &ndash;&gt;--> <!-- The NIO implemenation is not working properly on OS X.. -->
<!--<exclude>**/FailoverConsumerTest.*</exclude>--> <exclude>**/nio/**</exclude>
<exclude>**/NioQueueSubscriptionTest.*/</exclude>
<!--&lt;!&ndash; The NIO implemenation is not working properly on OS X.. &ndash;&gt;--> <!-- A test used for memory profiling only. -->
<!--<exclude>**/nio/**</exclude>--> <exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>
<!--<exclude>**/NioQueueSubscriptionTest.*/</exclude>-->
<!--&lt;!&ndash; A test used for memory profiling only. &ndash;&gt;--> <!-- used just to test potential memory leaks manually -->
<!--<exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>--> <exclude>**/JDBCTestMemory.*</exclude>
<!--&lt;!&ndash; used just to test potential memory leaks manually &ndash;&gt;--> <exclude>**/amq1490/*</exclude>
<!--<exclude>**/JDBCTestMemory.*</exclude>--> <exclude>**/archive/*</exclude>
<exclude>**/NetworkFailoverTest.*/**</exclude>
<!--<exclude>**/amq1490/*</exclude>--> <exclude>**/vm/VMTransportBrokerTest.*</exclude>
<!--<exclude>**/archive/*</exclude>--> <exclude>**/broker/MarshallingBrokerTest.*</exclude>
<!--<exclude>**/NetworkFailoverTest.*/**</exclude>-->
<!--<exclude>**/vm/VMTransportBrokerTest.*</exclude>--> <exclude>**/AMQDeadlockTest3.*</exclude>
<!--<exclude>**/broker/MarshallingBrokerTest.*</exclude>-->
<!--<exclude>**/AMQDeadlockTest3.*</exclude>--> <!-- https://issues.apache.org/activemq/browse/AMQ-2050 -->
<exclude>**/ProxyConnectorTest.*</exclude>
<!--&lt;!&ndash; https://issues.apache.org/activemq/browse/AMQ-2050 &ndash;&gt;--> <!-- 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>**/ProxyConnectorTest.*</exclude>--> <exclude>**/BrokerNetworkWithStuckMessagesTest.*</exclude>
<exclude>**/DoSTest.*</exclude>
<!--&lt;!&ndash; 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/ &ndash;&gt;-->
<!--<exclude>**/BrokerNetworkWithStuckMessagesTest.*</exclude>-->
<!--<exclude>**/DoSTest.*</exclude>-->
</excludes> </excludes>
</configuration> </configuration>
@ -702,18 +695,16 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<excludes combine.children="append"> <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 --> <!-- These tests run too slow to execute as part of the unit tests -->
<exclude>**/TransactionNotStartedErrorTest.*</exclude> <exclude>**/TransactionNotStartedErrorTest.*</exclude>
<exclude>**/DefaultStoreBrokerTest.*</exclude> <exclude>**/DefaultStoreBrokerTest.*</exclude>
<exclude>**/TcpTransportBrokerTest.*</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 --> <!-- Don't run the openwire encoding tests since the test and impls are code generated -->
<exclude>org/apache/activemq/openwire/v*/**</exclude> <exclude>org/apache/activemq/openwire/v*/**</exclude>