You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2015/07/09 15:11:31 UTC

[3/3] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5552 - added profile for activemq.tests=smoke to run a fast subset of tests that gives a fast verification of a full build

https://issues.apache.org/jira/browse/AMQ-5552 - added profile for activemq.tests=smoke to run a fast subset of tests that gives a fast verification of a full build


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a05a9a21
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a05a9a21
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a05a9a21

Branch: refs/heads/master
Commit: a05a9a2129ba7432e628e8279feb8a9b5922e5d9
Parents: c454fe3
Author: gtully <ga...@gmail.com>
Authored: Thu Jul 9 14:10:38 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Thu Jul 9 14:10:38 2015 +0100

----------------------------------------------------------------------
 activemq-amqp/pom.xml           | 25 ++++++++++++++++++++++
 activemq-broker/pom.xml         | 29 +++++++++++++++++++------
 activemq-camel/pom.xml          | 27 ++++++++++++++++++++++++
 activemq-client/pom.xml         | 23 ++++++++++++++++++++
 activemq-http/pom.xml           | 23 ++++++++++++++++++++
 activemq-jaas/pom.xml           | 26 +++++++++++++++++++++++
 activemq-jms-pool/pom.xml       | 28 ++++++++++++++++++++++++
 activemq-kahadb-store/pom.xml   | 36 +++++++++++++++++++++----------
 activemq-karaf-itest/pom.xml    | 21 ++++++++++++++++++
 activemq-leveldb-store/pom.xml  | 22 +++++++++++++++++++
 activemq-mqtt/pom.xml           | 33 +++++++++++++++++++----------
 activemq-partition/pom.xml      | 23 ++++++++++++++++++++
 activemq-ra/pom.xml             | 31 +++++++++++++++++++++++----
 activemq-runtime-config/pom.xml | 24 +++++++++++++++++++++
 activemq-spring/pom.xml         | 22 +++++++++++++++++++
 activemq-stomp/pom.xml          | 36 +++++++++++++++++++++----------
 activemq-unit-tests/pom.xml     | 41 ++++++++++++++++++++++++++++++++++++
 activemq-web/pom.xml            | 23 ++++++++++++++++++++
 assembly/pom.xml                | 36 +++++++++++++++++++------------
 19 files changed, 473 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index ce28c7b..e8ab80e 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -181,6 +181,31 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/AmqpConnectionsTest.*</include>
+                <include>**/JMSClientSslTest.*</include>
+                <include>**/JoramJmsNioTest.*</include>
+                <include>**/AmqpFrameParserTest.*</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
       <profile>
           <id>activemq.tests.windows.excludes</id>
           <activation>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-broker/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index b73187e..21a9244 100755
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -184,12 +184,6 @@
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
             </property>
-            <!-- Uncomment the following if you want to configure custom logging
-              (using src/test/resources/log4j.properties) while running mvn:test Note: if you want
-              to see log messages on the console window remove "redirectTestOutputToFile" from
-              the parent pom -->
-            <!-- <property> <name>log4j.configuration</name> <value>file:target/test-classes/log4j.properties</value>
-              </property> -->
           </systemProperties>
           <includes>
             <include>**/*Test.*</include>
@@ -221,5 +215,28 @@
     </plugins>
   </build>
   <profiles>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/JmsQueueTransactionTest.*</exclude>
+                <exclude>**/MessageInterceptorTest.*</exclude>
+                <exclude>**/BrokerDestinationViewTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 16bda1f..f2a590a 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -230,4 +230,31 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/ActiveMQConfigureTest.*</include>
+                <include>**/ActiveMQJmsHeaderRouteTest.*</include>
+                <include>**/CamelJmsTest.*</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+  </profiles>
+
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index a45bfae..43dffd1 100755
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -322,5 +322,28 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/MemoryUsageConcurrencyTest.*</exclude>
+                <exclude>**/BitArrayBinTest.*</exclude>
+                <exclude>**/LRUCacheTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-http/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 59de71a..e11ca6c 100755
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -198,5 +198,28 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/HttpsJmsSendAndReceiveTest.*</include>
+                <include>**/WSTransportTest.*</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
   </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-jaas/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 8cdd42f..af489d1 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -123,4 +123,30 @@
       <optional>true</optional>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/LDAPModuleRoleExpansionTest.*</exclude>
+                <exclude>**/LDAPLoginModuleTest.*</exclude>
+                <exclude>**/PropertiesLoginModuleRaceConditionTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-jms-pool/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index bc60b55..67550d0 100755
--- a/activemq-jms-pool/pom.xml
+++ b/activemq-jms-pool/pom.xml
@@ -106,4 +106,32 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/AMQ4441Test.*</exclude>
+                <exclude>**/ConnectionExpiryEvictsFromPoolTest.*</exclude>
+                <exclude>**/PooledConnectionFactoryMaximumActiveTest.*</exclude>
+                <exclude>**/PooledConnectionTempQueueTest.*</exclude>
+                <exclude>**/PooledConnectionSessionCleanupTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-kahadb-store/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index f85577e..7e4b16e 100755
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -189,17 +189,6 @@
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
             </property>
-            <!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j.properties)
-                 while running mvn:test
-                 Note: if you want to see log messages on the console window remove
-                       "redirectTestOutputToFile" from the parent pom
-            -->
-            <!--
-            <property>
-              <name>log4j.configuration</name>
-              <value>file:target/test-classes/log4j.properties</value>
-            </property>
-            -->
           </systemProperties>
           <includes>
             <include>**/*Test.*</include>
@@ -239,6 +228,31 @@
   </build>
   <profiles>
     <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/JournalCorruptionEofIndexRecoveryTest.*</exclude>
+                <exclude>**/JournalCorruptionIndexRecoveryTest.*</exclude>
+                <exclude>**/index/*.*</exclude>
+                <exclude>**/PListImplTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
       <id>activemq.tests.aix.excludes</id>
       <activation>
         <property>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-karaf-itest/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index 8d6fea6..714ff8a 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -246,6 +246,27 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/ActiveMQBrokerNdCamelFeatureTest.*</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-leveldb-store/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 4a4de52..b101776 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -491,6 +491,28 @@
   </build>
 
     <profiles>
+      <profile>
+        <id>activemq.tests-sanity</id>
+        <activation>
+          <property>
+            <name>activemq.tests</name>
+            <value>smoke</value>
+          </property>
+        </activation>
+        <build>
+          <plugins>
+            <plugin>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <includes>
+                  <include>**/LevelDBStoreTest.*</include>
+                </includes>
+              </configuration>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
+
         <profile>
             <id>activemq.tests.windows.excludes</id>
             <activation>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index 511a452..82e42ad 100755
--- a/activemq-mqtt/pom.xml
+++ b/activemq-mqtt/pom.xml
@@ -219,22 +219,11 @@
           <reuseForks>false</reuseForks>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
-          <!-- Note: if you want to see log messages on the console window remove the following comment -->
-          <!-- <redirectTestOutputToFile>false</redirectTestOutputToFile> -->
            <systemProperties>
             <property>
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
             </property>
-            <!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j.properties)
-                 while running mvn:test
-            -->
-            <!--
-            <property>
-              <name>log4j.configuration</name>
-              <value>file:target/test-classes/log4j.properties</value>
-            </property>
-            -->
            </systemProperties>
            <!-- includes>
              <include>**/*Test.*</include>
@@ -278,6 +267,28 @@
               </plugins>
           </build>
       </profile>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/MQTTCodecTest.*</include>
+                <include>**/MQTTConnectTest.*</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
   
   <repositories>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-partition/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml
index ec36916..b8be820 100644
--- a/activemq-partition/pom.xml
+++ b/activemq-partition/pom.xml
@@ -108,5 +108,28 @@
     <plugins>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/PartitionBrokerTest.*</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
+  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-ra/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 7ca074d..9f0c851 100755
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -131,20 +131,43 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <!--forkMode>pertest</forkMode-->
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
           <includes>
-            <!--
-            <include>org.apache.activemq.ra.ServerSessionImplTest</include>
-            -->
             <include>**/*Test.*</include>
           </includes>
         </configuration>
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/FailoverManagedClusterTest.*</exclude>
+                <exclude>**/JmsXAQueueTransactionTest.*</exclude>
+                <exclude>**/JmsXARollback2CxTransactionTest.*</exclude>
+                <exclude>**/SSLMAnagedConnectionFactoryTest.*</exclude>
+                <exclude>**/SSLTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
+  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-runtime-config/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml
index fe2b3a4..86ebfae 100755
--- a/activemq-runtime-config/pom.xml
+++ b/activemq-runtime-config/pom.xml
@@ -186,5 +186,29 @@
     	</plugins>
     </pluginManagement>
   </build>
+  <profiles>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+  </profiles>
 
 </project>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-spring/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 4137483..c5015ee 100755
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -302,6 +302,28 @@
   </build>
 
     <profiles>
+      <profile>
+        <id>activemq.tests-sanity</id>
+        <activation>
+          <property>
+            <name>activemq.tests</name>
+            <value>smoke</value>
+          </property>
+        </activation>
+        <build>
+          <plugins>
+            <plugin>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <includes>
+                  <include>**/SpringBrokerFactoryTest.*</include>
+                </includes>
+              </configuration>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
+
         <profile>
             <id>activemq.tests.windows.excludes</id>
             <activation>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-stomp/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index 8f42c52..c4c0696 100755
--- a/activemq-stomp/pom.xml
+++ b/activemq-stomp/pom.xml
@@ -127,17 +127,6 @@
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
             </property>
-            <!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j.properties)
-                 while running mvn:test
-                 Note: if you want to see log messages on the console window remove
-                       "redirectTestOutputToFile" from the parent pom
-            -->
-            <!--
-            <property>
-              <name>log4j.configuration</name>
-              <value>file:target/test-classes/log4j.properties</value>
-            </property>
-            -->
           </systemProperties>
           <includes>
             <include>**/*Test.*</include>
@@ -151,6 +140,31 @@
   </build>
 
     <profiles>
+      <profile>
+        <id>activemq.tests-sanity</id>
+        <activation>
+          <property>
+            <name>activemq.tests</name>
+            <value>smoke</value>
+          </property>
+        </activation>
+        <build>
+          <plugins>
+            <plugin>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <includes>
+                  <include>**/StompPrefetchTest.*</include>
+                  <include>**/Stomp12Test.*</include>
+                  <include>**/Stomp12NIOTest.*</include>
+                  <include>**/StompTelnetTest.*</include>
+                </includes>
+              </configuration>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
+
         <profile>
             <id>activemq.tests.windows.excludes</id>
             <activation>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 7a18a1e..8bed72d 100755
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -539,6 +539,47 @@
       </build>
     </profile>
     <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/JMSConsumerTest.*</include>
+                <include>**/MBeanTest.*</include>
+                <include>**/BrokerTest.*</include>
+                <include>**/JmsQueueSendReceiveTest.*</include>
+                <include>**/JmsTopicRequestReplyTest.*</include>
+                <include>**/AdvisoryJmxTest.*</include>
+                <include>**/VirtualTopicPubSubTest.*</include>
+                <include>**/RedeliveryPluginTest.*</include>
+                <include>**/AMQ3014Test.*</include>
+                <include>**/AMQ3678Test.*</include>
+                <include>**/AMQ4222Test.*</include>
+                <include>**/AMQ4899Test.*</include>
+                <include>**/ActiveMQDestinationTest.*</include>
+                <include>**/XAConnectionFactoryTest.*</include>
+                <include>**/JDBCStoreOrderTest.*</include>
+                <include>**/KahaDBPersistenceAdapterTest.*</include>
+                <include>**/FailoverUriTest.*</include>
+                <include>**/TransactionRollbackOrderTest.*</include>
+                <include>**/StaticNetworkTest.*</include>
+                <include>**/QueueBrowsingLimitTest.*</include>
+                <include>**/DurableSubscriptionActivationTest.*</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>activemq.exclude-broken-tests</id>
       <activation>
         <activeByDefault>true</activeByDefault>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/activemq-web/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 790b0a5..16eb3ac 100755
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -139,4 +139,27 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <profiles>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/RemoteJMXBrokerFailoverTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq/blob/a05a9a21/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index dcbe733..9b2b592 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -511,8 +511,6 @@
               <descriptors>
                  <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
               </descriptors>
-              <!--<finalName>${pom.artifactId}-${project.version}</finalName>-->
-              <!--<appendAssemblyId>false</appendAssemblyId>-->
             </configuration>
           </execution>
           <execution>
@@ -525,21 +523,10 @@
               <descriptors>
                  <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
               </descriptors>
-              <!--<finalName>${pom.artifactId}-${project.version}</finalName>-->
-              <!--<appendAssemblyId>false</appendAssemblyId>-->
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <!-- plugin>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-maven-plugin</artifactId>
-        <version>${project.version}</version>
-        <configuration>
-          <configFile>${basedir}/src/release/conf/activemq.xml</configFile>
-          <url>broker:(tcp://localhost:61616)?useJmx=false</url>
-        </configuration>
-      </plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -566,4 +553,27 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>activemq.tests-sanity</id>
+      <activation>
+        <property>
+          <name>activemq.tests</name>
+          <value>smoke</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/BrokerXmlConfigStartTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>