Scrub the pom files and remove old cruft and leftovers from the recent refactoring

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439680 13f79535-47bb-0310-9956-ffa450edef68

activemq-amqp/pom.xml

@@ -32,7 +32,6 @@
   <description>ActiveMQ implementaiton of AMQP messaging protocol</description>
 
   <dependencies>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -41,13 +40,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.qpid</groupId>
       <artifactId>proton-jms</artifactId>
       <version>${qpid-proton-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.fusesource.hawtbuf</groupId>
       <artifactId>hawtbuf</artifactId>
@@ -75,7 +72,6 @@
       <artifactId>jetty-all-server</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -87,12 +83,6 @@
       <artifactId>activemq-spring</artifactId>
       <scope>test</scope>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.apache.activemq</groupId>-->
-      <!--<artifactId>activemq-console</artifactId>-->
-      <!--<scope>test</scope>-->
-    <!--</dependency>-->
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -103,9 +93,8 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
-  
+
   <profiles>
     <profile>
       <!-- profile which is activated is the swiftmq-client-home prop is defined.
@@ -155,5 +144,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>

activemq-blueprint/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -31,24 +32,24 @@
 
   <properties>
     <activemq.osgi.import.pkg>
-        org.apache.xbean*;version="[3.12,4)",
+      org.apache.xbean*;version="[3.12,4)",
-        org.apache.aries.blueprint.*;version="[1.0,2)",
+      org.apache.aries.blueprint.*;version="[1.0,2)",
-          *
+      *
     </activemq.osgi.import.pkg>
   </properties>
 
-    <dependencies>
+  <dependencies>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
+      <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
+      <artifactId>org.apache.aries.blueprint</artifactId>
-            <version>${aries-version}</version>
+      <version>${aries-version}</version>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.xbean</groupId>
+      <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-blueprint</artifactId>
+      <artifactId>xbean-blueprint</artifactId>
-            <version>${xbean-version}</version>
+      <version>${xbean-version}</version>
-        </dependency>
+    </dependency>
-    </dependencies>
+  </dependencies>
 
   <build>
     <plugins>
@@ -57,18 +58,17 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <!--Fragment-Host>org.apache.activemq.activemq-core;version=[$(version;==;${activemq.osgi.version}),$(version;=+;${activemq.osgi.version}))</Fragment-Host-->
+            <!--Fragment-Host>org.apache.activemq.activemq-core;version=[$(version;==;${activemq.osgi.version}),$(version;=+;${activemq.osgi.version}))</Fragment-Host -->
             <Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>
-    <plugin>
+      <plugin>
-      <artifactId>maven-resources-plugin</artifactId>
+        <artifactId>maven-resources-plugin</artifactId>
-    </plugin>
+      </plugin>
-    <plugin>
+      <plugin>
-      <artifactId>maven-install-plugin</artifactId>
+        <artifactId>maven-install-plugin</artifactId>
-    </plugin>
+      </plugin>
     </plugins>
   </build>
-
 </project>

activemq-broker/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -48,7 +49,7 @@
     </dependency>
 
     <!-- =============================== -->
-    <!-- Optional Dependencies           -->
+    <!-- Optional Dependencies -->
     <!-- =============================== -->
 
     <dependency>
@@ -62,10 +63,6 @@
       <artifactId>activemq-jaas</artifactId>
       <optional>true</optional>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.springframework</groupId>-->
-      <!--<artifactId>spring-context</artifactId>-->
-    <!--</dependency>-->
 
     <!-- to support XPath based Selectors -->
     <dependency>
@@ -75,7 +72,7 @@
     </dependency>
 
     <!-- =============================== -->
-    <!-- Testing Dependencies            -->
+    <!-- Testing Dependencies -->
     <!-- =============================== -->
     <dependency>
       <groupId>junit</groupId>
@@ -181,27 +178,21 @@
           <forkMode>always</forkMode>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
-
+          <systemProperties>
-           <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)
+            <!-- Uncomment the following if you want to configure custom logging
-                 while running mvn:test
+              (using src/test/resources/log4j.properties) while running mvn:test Note: if you want
-                 Note: if you want to see log messages on the console window remove
+              to see log messages on the console window remove "redirectTestOutputToFile" from
-                       "redirectTestOutputToFile" from the parent pom
+              the parent pom -->
-            -->
+            <!-- <property> <name>log4j.configuration</name> <value>file:target/test-classes/log4j.properties</value>
-            <!--
+              </property> -->
-            <property>
+          </systemProperties>
-              <name>log4j.configuration</name>
+          <includes>
-              <value>file:target/test-classes/log4j.properties</value>
+            <include>**/*Test.*</include>
-            </property>
+          </includes>
-            -->
-           </systemProperties>
-           <includes>
-             <include>**/*Test.*</include>
-           </includes>
         </configuration>
       </plugin>
       <plugin>

activemq-camel/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 

activemq-client/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -72,7 +73,7 @@
     </dependency>
 
     <!-- =============================== -->
-    <!-- Testing Dependencies            -->
+    <!-- Testing Dependencies -->
     <!-- =============================== -->
     <dependency>
       <groupId>junit</groupId>
@@ -86,14 +87,13 @@
     </dependency>
 
     <!-- =============================== -->
-    <!-- Plugin Dependencies            -->
+    <!-- Plugin Dependencies -->
     <!-- =============================== -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-openwire-generator</artifactId>
       <optional>true</optional>
     </dependency>
-    
   </dependencies>
 
   <reporting>
@@ -198,34 +198,27 @@
     </resources>
 
     <plugins>
-
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkMode>always</forkMode>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
-
+          <systemProperties>
-           <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)
+            <!-- Uncomment the following if you want to configure custom logging
-                 while running mvn:test
+              (using src/test/resources/log4j.properties) while running mvn:test Note: if you want
-                 Note: if you want to see log messages on the console window remove
+              to see log messages on the console window remove "redirectTestOutputToFile" from
-                       "redirectTestOutputToFile" from the parent pom
+              the parent pom -->
-            -->
+            <!-- <property> <name>log4j.configuration</name> <value>file:target/test-classes/log4j.properties</value>
-            <!--
+              </property> -->
-            <property>
+          </systemProperties>
-              <name>log4j.configuration</name>
+          <includes>
-              <value>file:target/test-classes/log4j.properties</value>
+            <include>**/*Test.*</include>
-            </property>
+          </includes>
-            -->
-           </systemProperties>
-           <includes>
-             <include>**/*Test.*</include>
-           </includes>
         </configuration>
       </plugin>
 
@@ -279,8 +272,11 @@
             <configuration>
               <tasks>
                 <echo>Running OpenWire Generator</echo>
-                <taskdef name="generate" classname="org.apache.activemq.openwire.tool.JavaGeneratorTask" classpathref="maven.compile.classpath" />
+                <taskdef name="generate"
-                <generate version="9" basedir="${basedir}" generateTests="false"/>
+                  classname="org.apache.activemq.openwire.tool.JavaGeneratorTask"
+                  classpathref="maven.compile.classpath" />
+                <generate version="9" basedir="${basedir}"
+                  generateTests="false" />
               </tasks>
             </configuration>
           </plugin>

activemq-console/pom.xml

@@ -6,17 +6,18 @@
   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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -43,17 +44,8 @@
       org.apache.activemq.console*;version=${project.version};-noimport:=true,
     </activemq.osgi.export>
   </properties>
-  
+
   <dependencies>
-    <!-- activemq related dependencies -->
-    <!--<dependency>-->
-      <!--<groupId>${project.groupId}</groupId>-->
-      <!--<artifactId>activemq-spring</artifactId>-->
-    <!--</dependency>-->
-    <!--<dependency>-->
-      <!--<groupId>${project.groupId}</groupId>-->
-      <!--<artifactId>activemq-amq-store</artifactId>-->
-    <!--</dependency>-->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-kahadb-store</artifactId>
@@ -68,17 +60,14 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
     </dependency>
-
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -100,8 +89,6 @@
       <artifactId>jackson-mapper-asl</artifactId>
       <version>${jackson-version}</version>
     </dependency>
-
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -114,7 +101,7 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -130,13 +117,11 @@
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
@@ -158,16 +143,13 @@
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
     </dependency>
-    
     <dependency>
       <groupId>commons-daemon</groupId>
       <artifactId>commons-daemon</artifactId>
-    </dependency> 
+    </dependency>
-
   </dependencies>
 
   <build>
-
     <plugins>
       <!-- Configure which tests are included/excuded -->
       <plugin>
@@ -175,31 +157,24 @@
         <configuration>
           <forkMode>pertest</forkMode>
           <childDelegation>false</childDelegation>
-          <useFile>true</useFile>          
+          <useFile>true</useFile>
-           <systemProperties>
+          <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
+              while running mvn:test Note: if you want to see log messages on the console window remove "redirectTestOutputToFile"
-                 Note: if you want to see log messages on the console window remove
+              from the parent pom -->
-                       "redirectTestOutputToFile" from the parent pom
+            <!-- <property> <name>log4j.configuration</name> <value>file:target/test-classes/log4j.properties</value>
-            -->
+              </property> -->
-            <!--           
-            <property>
-              <name>log4j.configuration</name>
-              <value>file:target/test-classes/log4j.properties</value>
-            </property>
-            -->
           </systemProperties>
-
           <includes>
             <include>**/*Test*</include>
           </includes>
         </configuration>
       </plugin>
-      
+
       <plugin>
         <groupId>org.fusesource.hawtbuf</groupId>
         <artifactId>hawtbuf-protoc</artifactId>
@@ -207,7 +182,7 @@
         <configuration>
           <type>alt</type>
         </configuration>
-         <executions>
+        <executions>
           <execution>
             <goals>
               <goal>compile</goal>

activemq-fileserver/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -46,8 +47,7 @@
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
       </plugin>
-
+      <plugin>
-    <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
@@ -59,7 +59,6 @@
   </build>
 
   <dependencies>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -72,14 +71,12 @@
       <scope>provided</scope>
     </dependency>
 
-
     <!-- used for testing -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
@@ -92,13 +89,11 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all-server</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -110,7 +105,6 @@
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <properties>

activemq-http/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -31,8 +32,6 @@
   <description>ActiveMQ HTTP Protocol Support</description>
 
   <dependencies>
-
-    <!-- activemq -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-spring</artifactId>
@@ -45,27 +44,19 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all-server</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-websocket</artifactId>
+      <artifactId>jetty-websocket</artifactId>
-        <version>${jetty-version}</version>
+      <version>${jetty-version}</version>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.eclipse.jetty</groupId>-->
-      <!--<artifactId>jetty-webapp</artifactId>-->
-      <!--<version>${jetty-version}</version>-->
-    <!--</dependency>-->
-
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
@@ -86,7 +77,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -98,7 +88,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
@@ -117,48 +106,47 @@
       <version>2.25.0</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
   <build>
     <plugins>
-        <plugin>
+      <plugin>
-            <artifactId>maven-jar-plugin</artifactId>
+        <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
+        <configuration>
-                <archive>
+          <archive>
-                    <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                </archive>
+          </archive>
-            </configuration>
+        </configuration>
-        </plugin>
+      </plugin>
-       <plugin>
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
-            <instructions>
+          <instructions>
-                <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                <Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
+            <Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
-                <Export-Package>
+            <Export-Package>
-                    org.apache.activemq.transport.http*;version=${project.version};-noimport:=;-split-package:=merge-last,
+              org.apache.activemq.transport.http*;version=${project.version};-noimport:=;-split-package:=merge-last,
-                    org.apache.activemq.transport.https*;version=${project.version};-noimport:=;-split-package:=merge-last
+              org.apache.activemq.transport.https*;version=${project.version};-noimport:=;-split-package:=merge-last
-                </Export-Package>
+            </Export-Package>
-                <Import-Package>
+            <Import-Package>
-                    org.eclipse.jetty*;version="[7.5,8.0)";resolution:=optional,
+              org.eclipse.jetty*;version="[7.5,8.0)";resolution:=optional,
-                    !org.apache.activemq.transport.ws*;version=${project.version},
+              !org.apache.activemq.transport.ws*;version=${project.version},
-                    !org.apache.activemq.transport.xstream;version=${project.version},
+              !org.apache.activemq.transport.xstream;version=${project.version},
-                    !org.apache.activemq.transport.util;version=${project.version},
+              !org.apache.activemq.transport.util;version=${project.version},
-                    org.apache.activemq*;version=${project.version};resolution:=optional
+              org.apache.activemq*;version=${project.version};resolution:=optional
-                </Import-Package>
+            </Import-Package>
-            </instructions>
+          </instructions>
         </configuration>
-           <executions>
+        <executions>
-               <execution>
+          <execution>
-                   <id>bundle-manifest</id>
+            <id>bundle-manifest</id>
-                   <phase>process-classes</phase>
+            <phase>process-classes</phase>
-                   <goals>
+            <goals>
-                       <goal>manifest</goal>
+              <goal>manifest</goal>
-                   </goals>
+            </goals>
-               </execution>
+          </execution>
-           </executions>
+        </executions>
-       </plugin>
+      </plugin>
       <!-- Configure which tests are included/excuded -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -169,32 +157,29 @@
   </build>
   <profiles>
     <profile>
-        <id>activemq.tests-quick</id>
+      <id>activemq.tests-quick</id>
-        <activation>
+      <activation>
-            <activeByDefault>true</activeByDefault>
+        <activeByDefault>true</activeByDefault>
-        </activation>
+      </activation>
-        <build>
+      <build>
-            <plugins>
+        <plugins>
-                <plugin>
+          <plugin>
-                    <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 so 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 so take too long to run -->
+                <exclude>**/load/*</exclude>
-                            <exclude>**/load/*</exclude>
+                <exclude>org/apache/activemq/transport/http/HttpClientReconnectTest.*</exclude>
-
+                <exclude>org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.*</exclude>
-                            <exclude>org/apache/activemq/transport/http/HttpClientReconnectTest.*</exclude>
+                <exclude>org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.*</exclude>
-                            <exclude>org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.*</exclude>
+                <exclude>org/apache/activemq/transport/http/HttpSpringTest.*</exclude>
-                            <exclude>org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.*</exclude>
+              </excludes>
-                            <exclude>org/apache/activemq/transport/http/HttpSpringTest.*</exclude>
+            </configuration>
-                        </excludes>
+          </plugin>
-                    </configuration>
+        </plugins>
-                </plugin>
+      </build>
-            </plugins>
-        </build>
     </profile>
- </profiles>
+  </profiles>
-
 </project>

activemq-itests-spring31/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +33,7 @@
 
   <properties>
 	  <!-- force using spring 3.1.x -->
-	  <spring-version>3.1.3.RELEASE</spring-version>
+    <spring-version>3.1.3.RELEASE</spring-version>
   </properties>
 
   <dependencies>
@@ -86,7 +87,5 @@
       <artifactId>log4j</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
-
 </project>

activemq-jaas/pom.xml

@@ -6,17 +6,18 @@
   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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -29,10 +30,6 @@
   <name>ActiveMQ :: JAAS</name>
   <description>A collection of generic JAAS Login Modules</description>
 
-  <properties>
-	<activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
-  </properties>
-
   <build>
     <plugins>
       <!-- Configure which tests are included/excuded -->
@@ -43,7 +40,7 @@
           <useFile>true</useFile>
           <argLine>-Xmx512M</argLine>
 
-           <systemProperties>
+          <systemProperties>
             <property>
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
@@ -53,7 +50,7 @@
                  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>
@@ -68,24 +65,22 @@
 
   <dependencies>
     <dependency>
-        <groupId>commons-collections</groupId>
+      <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
+      <artifactId>commons-collections</artifactId>
-        <scope>test</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-integ</artifactId>
       <version>${directory-version}</version>
       <scope>test</scope>
-    </dependency>  
+    </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-integ</artifactId>
       <version>${directory-version}</version>
       <scope>test</scope>
-    </dependency> 
+    </dependency>
-    
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -98,9 +93,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
+      <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+      <artifactId>log4j</artifactId>
-        <scope>test</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -112,5 +107,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
 </project>

activemq-jdbc-store/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -35,11 +36,6 @@
   </properties>
 
   <dependencies>
-    <!-- <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activeio-core</artifactId>
-      <optional>true</optional>
-    </dependency> -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -54,126 +50,10 @@
       <artifactId>activeio-core</artifactId>
       <optional>true</optional>
     </dependency>
-
-    <!-- =============================== -->
-    <!-- Optional Dependencies           -->
-    <!-- =============================== -->
-
-    <!-- =============================== -->
-    <!-- Testing Dependencies            -->
-    <!-- =============================== -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-    <!-- database testing -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-primitives</groupId>
-      <artifactId>commons-primitives</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>axion</groupId>
-      <artifactId>axion</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
   <reporting>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <links>
-            <link>${javase-javadoc-url}</link>
-            <link>${javaee-javadoc-url}</link>
-            <link>${slf4j-javadoc-url}</link>
-            <link>http://junit.sourceforge.net/javadoc/</link>
-          </links>
-          <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
-          <linksource>true</linksource>
-          <maxmemory>256m</maxmemory>
-          <source>${source-version}</source>
-          <groups>
-            <group>
-              <title>JMS Client</title>
-              <packages>org.apache.activemq:org.apache.activemq.command</packages>
-            </group>
-            <group>
-              <title>JMS Client support classes for working with BLOBs and JNDI</title>
-              <packages>org.apache.activemq.blob:org.apache.activemq.jndi</packages>
-            </group>
-            <group>
-              <title>Enterprise Integration Pattern support via Camel</title>
-              <packages>org.apache.activemq.camel:org.apache.activemq.camel.*</packages>
-            </group>
-            <group>
-              <title>Spring support</title>
-              <packages>org.apache.activemq.spring:org.apache.activemq.xbean:org.apache.activemq.pool</packages>
-            </group>
-            <group>
-              <title>JMS Client Implementation classes</title>
-              <packages>org.apache.activemq.filter:org.apache.activemq.management:org.apache.activemq.selector:org.apache.activemq.thread</packages>
-            </group>
-            <group>
-              <title>Broker implementation</title>
-              <packages>org.apache.activemq.advisory:org.apache.activemq.broker:org.apache.activemq.broker.*:org.apache.activemq.state:org.apache.activemq.security:org.apache.activemq.transaction</packages>
-            </group>
-            <group>
-              <title>Broker Persistent Store</title>
-              <packages>org.apache.activemq.store:org.apache.activemq.store.*</packages>
-            </group>
-            <group>
-              <title>Kaha fast file based storage</title>
-              <packages>org.apache.activemq.kaha:org.apache.activemq.kaha.*</packages>
-            </group>
-            <group>
-              <title>Transports</title>
-              <packages>org.apache.activemq.transport:org.apache.activemq.transport.*</packages>
-            </group>
-            <group>
-              <title>Memory handling</title>
-              <packages>org.apache.activemq.memory:org.apache.activemq.memory.*</packages>
-            </group>
-            <group>
-              <title>Networks of Brokers</title>
-              <packages>org.apache.activemq.network:org.apache.activemq.network.*</packages>
-            </group>
-            <group>
-              <title>OpenWire support</title>
-              <packages>org.apache.activemq.openwire:org.apache.activemq.openwire.*</packages>
-            </group>
-            <group>
-              <title>Utility classes</title>
-              <packages>org.apache.activemq.util:org.apache.activemq.wireformat:org.apache.activemq.proxy</packages>
-            </group>
-          </groups>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -187,71 +67,14 @@
   </reporting>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>${project.basedir}/src/main/filtered-resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only.
-            It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.activemq.protobuf</groupId>
-                    <artifactId>activemq-protobuf</artifactId>
-                    <versionRange>[0.0.0,)</versionRange>
-                    <goals>
-                      <goal>compile</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
-          </instructions>
-        </configuration>
-      </plugin>
-
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkMode>always</forkMode>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
-
+          <systemProperties>
-           <systemProperties>
             <property>
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
@@ -267,713 +90,12 @@
               <value>file:target/test-classes/log4j.properties</value>
             </property>
             -->
-           </systemProperties>
+          </systemProperties>
-           <includes>
+          <includes>
-             <include>**/*Test.*</include>
+            <include>**/*Test.*</include>
-           </includes>
+          </includes>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.activemq.protobuf</groupId>
-        <artifactId>activemq-protobuf</artifactId>
-         <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}/activemq-data</directory>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-          <id>package</id>
-          <phase>package</phase>
-          <configuration>
-            <tasks>
-              <echo>Deleting unwanted resources from the test-jar</echo>
-              <delete dir="${project.build.directory}/test-classes" verbose="true">
-                <include name="*.*" />
-              </delete>
-            </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>site</id>
-            <phase>site</phase>
-            <configuration>
-              <tasks>
-                <echo>Running the XSDDoc task</echo>
-                <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" />
-                <mkdir dir="${basedir}/target/site/xsddoc" />
-                <xsddoc file="${basedir}/target/classes/activemq.xsd" out="${basedir}/target/site/xsddoc" doctitle="Apache ActiveMQ XML Schema Reference" header="&lt;a href='http://activemq.apache.org/'&gt;Apache ActiveMQ&lt;/a&gt;" footer="Copyright 2005-2012 (c) the &lt;a href='http://www.apache.org/'&gt;Apache Software Foundation&lt;/a&gt;" verbose="false" />
-                <!--
-                        css="${basedir}/../etc/css/stylesheet.css"
-                -->
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>xsddoc</groupId>
-            <artifactId>maven-xsddoc-plugin</artifactId>
-            <version>1.0</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <!-- generate the attached tests jar -->
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <configuration>
-      <check>
-            <branchRate>50</branchRate>
-            <lineRate>50</lineRate>
-            <haltOnFailure>true</haltOnFailure>
-            <totalBranchRate>50</totalBranchRate>
-            <totalLineRate>50</totalLineRate>
-          </check>
         </configuration>
       </plugin>
     </plugins>
   </build>
-    <profiles>
-        <profile>
-            <id>activemq.tests-all</id>
-            <activation>
-                <property>
-                    <name>activemq.tests</name>
-                    <value>all</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes combine.children="append">
-                                <exclude>none</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>activemq.exclude-broken-tests</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>activemq.tests</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes combine.children="append">
-                                <!-- 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>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>activemq.tests-quick</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes combine.children="append">
-                                <exclude>**/perf/SimpleDurableTopicTest.*</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>
-
-                                <!-- this is a list of our slowest tests (slowest on top).. disabled to bring the build down to about 30 min -->
-                                <exclude>org/apache/activemq/ActiveMQInputStreamTest.*</exclude>
-                                <exclude>org/apache/activemq/ActiveMQMessageAuditTest.*</exclude>
-                                <exclude>org/apache/activemq/BrokerConfigTest.*</exclude>
-                                <exclude>org/apache/activemq/ConsumerReceiveWithTimeoutTest.*</exclude>
-                                <exclude>org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.*</exclude>
-                                <exclude>org/apache/activemq/ExpiryHogTest.*</exclude>
-                                <exclude>org/apache/activemq/JmsAutoAckListenerTest.*</exclude>
-                                <exclude>org/apache/activemq/JmsClientAckListenerTest.*</exclude>
-                                <exclude>org/apache/activemq/JmsDurableTopicSelectorTest.*</exclude>
-                                <exclude>org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.*</exclude>
-                                <exclude>org/apache/activemq/JmsSendWithAsyncCallbackTest.*</exclude>
-                                <exclude>org/apache/activemq/JmsTopicSelectorTest.*</exclude>
-                                <exclude>org/apache/activemq/MessageEvictionTest.*</exclude>
-                                <exclude>org/apache/activemq/MessageListenerRedeliveryTest.*</exclude>
-                                <exclude>org/apache/activemq/OnePrefetchAsyncConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/OptimizedAckTest.*</exclude>
-                                <exclude>org/apache/activemq/PerDestinationStoreLimitTest.*</exclude>
-                                <exclude>org/apache/activemq/ProducerFlowControlSendFailTest.*</exclude>
-                                <exclude>org/apache/activemq/ProducerFlowControlTest.*</exclude>
-                                <exclude>org/apache/activemq/QueueConsumerPriorityTest.*</exclude>
-                                <exclude>org/apache/activemq/ReconnectWithSameClientIDTest.*</exclude>
-                                <exclude>org/apache/activemq/RemoveDestinationTest.*</exclude>
-                                <exclude>org/apache/activemq/TimeStampTest.*</exclude>
-                                <exclude>org/apache/activemq/advisory/DestinationListenerTest.*</exclude>
-                                <exclude>org/apache/activemq/advisory/MasterSlaveTempQueueMemoryTest.*</exclude>
-                                <exclude>org/apache/activemq/advisory/TempDestLoadTest.*</exclude>
-                                <exclude>org/apache/activemq/advisory/TempQueueMemoryTest.*</exclude>
-                                <exclude>org/apache/activemq/blob/FilesystemBlobTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/DoubleSubscriptionTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/JdbcXARecoveryBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/QueueMbeanRestartTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ReconnectWithJMXEnabledTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/RecoveryBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/RedeliveryRestartTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/SpringTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/XARecoveryBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/MasterSlaveSlaveDieTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/MasterSlaveSlaveShutdownTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/TopicMasterSlaveTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/jmx/MBeanTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/jmx/PurgeTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/policy/AbortSlowConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/DestinationGCTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/DestinationRemoveRestartTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/UniquePropertyMessageEvictionStrategyTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/cursors/CursorDurableTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/cursors/NegativeQueueTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/scheduler/JmsSchedulerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/scheduler/JobSchedulerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/store/RecoverExpiredMessagesTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/util/PluginBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/util/TraceBrokerPathPluginTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/virtual/CompositeTopicTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/virtual/FilteredQueueTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/virtual/MirroredQueueCorrectMemoryUsageTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/virtual/VirtualTopicDLQTest.*</exclude>
-                                <exclude>org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ1687Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ1853Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ1893Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ1917Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ1936Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2021Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2084Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2149KahaDBTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2149Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2171Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2183Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2200Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2213Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2314Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2356Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2364Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2401Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2413Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2439Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2489Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2512Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2513Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2580Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2584Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2616Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2645Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2751Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2764Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2832Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2870Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2910Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2982Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ2983Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3120Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3140Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3141Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3145Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3157Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3167Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3274Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3324Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3352Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3405Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3436Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3445Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3454Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3529Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3567Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3622Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3625Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3674Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3675Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3678Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3732Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/AMQ3841Test.*</exclude>
-                                <exclude>org/apache/activemq/bugs/ActiveMQSlowConsumerManualTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/ConnectionPerMessageTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/CraigsBugTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/DataFileNotDeletedTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/DoubleExpireTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/DurableConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/JMSDurableTopicNoLocalTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/JmsTimeoutTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/MemoryUsageBlockResumeTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/MemoryUsageCleanupTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/MessageExpirationReaperTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/MissingDataFileTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/QueueWorkerPrefetchTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/SlowConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupAMQStoreTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/TempStorageBlockedBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/TempStoreDataCleanupTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/VMTransportClosureTest.*</exclude>
-                                <exclude>org/apache/activemq/bugs/amq1095/MessageSelectorTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/AMQ2611Test.*</exclude>
-                                <exclude>org/apache/activemq/camel/CamelDestinationExclusiveConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/CamelRedeliveryTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/CamelVMTransportRoutingTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/DlqTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/JmsJdbcXATest.*</exclude>
-                                <exclude>org/apache/activemq/camel/SetHeaderTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/TransactedConsumeTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/component/ActiveMQRouteTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/component/AutoExposeQueuesInCamelTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/component/InvokeRequestReplyUsingJmsReplyToHeaderTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/component/JmsSimpleRequestReplyTest.*</exclude>
-                                <exclude>org/apache/activemq/camel/component/JournalRouteTest.*</exclude>
-                                <exclude>org/apache/activemq/command/MessageCompressionTest.*</exclude>
-                                <exclude>org/apache/activemq/config/BrokerXmlConfigFromJNDITest.*</exclude>
-                                <exclude>org/apache/activemq/config/ConfigTest.*</exclude>
-                                <exclude>org/apache/activemq/console/command/AMQJournalToolTest.*</exclude>
-                                <exclude>org/apache/activemq/console/command/TestAMQ3410.*</exclude>
-                                <exclude>org/apache/activemq/console/command/TestAMQ3411.*</exclude>
-                                <exclude>org/apache/activemq/console/command/TestPurgeCommand.*</exclude>
-                                <exclude>org/apache/activemq/kaha/LoadTest.*</exclude>
-                                <exclude>org/apache/activemq/kaha/impl/index/hash/HashTest.*</exclude>
-                                <exclude>org/apache/activemq/network/DemandForwardingBridgeFilterTest.*</exclude>
-                                <exclude>org/apache/activemq/network/DuplexNetworkMBeanTest.*</exclude>
-                                <exclude>org/apache/activemq/network/DuplexNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/network/FailoverStaticNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/network/NetworkBrokerDetachTest.*</exclude>
-                                <exclude>org/apache/activemq/network/NetworkConnectionsTest.*</exclude>
-                                <exclude>org/apache/activemq/network/NetworkLoadTest.*</exclude>
-                                <exclude>org/apache/activemq/network/NetworkReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/network/NetworkRemovesSubscriptionsTest.*</exclude>
-                                <exclude>org/apache/activemq/network/NetworkRestartPlainTest.*</exclude>
-                                <exclude>org/apache/activemq/network/NetworkRestartTest.*</exclude>
-                                <exclude>org/apache/activemq/network/SimpleNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/network/jms/QueueBridgeTest.*</exclude>
-                                <exclude>org/apache/activemq/network/jms/QueueBridgeXBeanTest.*</exclude>
-                                <exclude>org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/network/jms/TopicBridgeSpringTest.*</exclude>
-                                <exclude>org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/network/jms/TopicBridgeXBeanTest.*</exclude>
-                                <exclude>org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/plugin/BrokerStatisticsPluginTest.*</exclude>
-                                <exclude>org/apache/activemq/pool/ConnectionExpiryEvictsFromPoolTest.*</exclude>
-                                <exclude>org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.*</exclude>
-                                <exclude>org/apache/activemq/pool/PooledConnectionFactoryTest.*</exclude>
-                                <exclude>org/apache/activemq/proxy/ProxyFailoverTest.*</exclude>
-                                <exclude>org/apache/activemq/ra/FailoverManagedClusterTest.*</exclude>
-                                <exclude>org/apache/activemq/ra/FailoverManagedConnectionTest.*</exclude>
-                                <exclude>org/apache/activemq/security/JaasNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/security/LDAPSecurityTest.*</exclude>
-                                <exclude>org/apache/activemq/security/SecurityJMXTest.*</exclude>
-                                <exclude>org/apache/activemq/security/XBeanSecurityWithGuestNoCredentialsOnlyTest.*</exclude>
-                                <exclude>org/apache/activemq/security/XBeanSslContextTest.*</exclude>
-                                <exclude>org/apache/activemq/spring/ListenerTest.*</exclude>
-                                <exclude>org/apache/activemq/spring/ParallelXATransactionTest.*</exclude>
-                                <exclude>org/apache/activemq/spring/Spring2XmlNamespacesTest.*</exclude>
-                                <exclude>org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.*</exclude>
-                                <exclude>org/apache/activemq/store/AutoStorePerDestinationTest.*</exclude>
-                                <exclude>org/apache/activemq/store/StorePerDestinationTest.*</exclude>
-                                <exclude>org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.*</exclude>
-                                <exclude>org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.*</exclude>
-                                <exclude>org/apache/activemq/store/jdbc/JDBCNegativeQueueTest.*</exclude>
-                                <exclude>org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.*</exclude>
-                                <exclude>org/apache/activemq/store/jdbc/JDBCPersistenceAdapterTest.*</exclude>
-                                <exclude>org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/store/jdbc/JDBCStoreOrderTest.*</exclude>
-                                <exclude>org/apache/activemq/store/jdbc/JDBCXACommitExceptionTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/KahaDBMessagePriorityTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/KahaDBStoreRecoveryExpiryTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/KahaDBStoreTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/KahaDBTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/KahaDBVersionTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/plist/PListTest.*</exclude>
-                                <exclude>org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.*</exclude>
-                                <exclude>org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/test/message/NestedMapAndListPropertyTest.*</exclude>
-                                <exclude>org/apache/activemq/test/message/NestedMapMessageTest.*</exclude>
-                                <exclude>org/apache/activemq/test/rollback/RollbacksWhileConsumingLargeQueueTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/QueueClusterTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/SoWriteTimeoutClientTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/SoWriteTimeoutTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/TopicClusterTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/discovery/DiscoveryUriTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/discovery/MasterSlaveDiscoveryTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/AMQ1925Test.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverClusterTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverComplexClusterTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverDuplicateTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverPriorityTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverRandomTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverTimeoutTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverTransactionTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverTransportBackupsTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverTransportBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/FailoverUpdateURIsTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/InitalReconnectDelayTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/failover/ReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/fanout/FanoutTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/http/HttpClientReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/http/HttpSpringTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/mqtt/MQTTTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/mqtt/MTQQNioTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/ConnectTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/Stomp11Test.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompAdvisoryTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompLoadTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompNIOLoadTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompNIOSSLLoadTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompNIOSSLTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompNIOTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompSSLLoadTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompSslAuthTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompSslTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompTelnetTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/stomp/StompVirtualTopicTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/tcp/InactivityMonitorTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/tcp/SslBrokerServiceTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/vm/VMTransportBrokerNameTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/vm/VMTransportWaitForTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/transport/xmpp/XmppTest.*</exclude>
-                                <exclude>org/apache/activemq/usage/StoreUsageTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/AMQ2927Test.*</exclude>
-                                <exclude>org/apache/activemq/usecases/AMQStackOverFlowTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/AMQStoreDurableSubscriptionTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/AdvisoryTopicCleanUpTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/BrowseOverNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ClientRebalanceTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/CompositePublishTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ConcurrentDestinationCreationTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ConsumeUncompressedCompressedMessageTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DiscriminatingConsumerLoadTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DispatchMultipleConsumersTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubProcessTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubSelectorDelayTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubSelectorDelayWithRestartTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubscriberNonPersistentMessageTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubscriptionActivationTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubscriptionOfflineTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubscriptionReactivationTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubscriptionSelectorTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/DurableUnsubscribeTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ExpiredMessagesTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/JDBCDurableSubscriptionTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/JMXRemoveQueueThenSendIgnoredTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/JdbcDurableSubDupTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/JournalDurableSubscriptionTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/LargeQueueSparseDeleteTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/MessageGroupCloseTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/MessageGroupDelayedTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/MessageGroupNewConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/MessageReroutingTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/MultiBrokersMultiClientsTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/NetworkAsyncStartTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/QueueDuplicatesTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/QueueRedeliverTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ReliableReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/StartAndStopBrokerTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/StaticNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TempTopicProducerFlowControlTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ThreeBrokerStompTemporaryQueueTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ThreeBrokerTempQueueNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TopicProducerFlowControlTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TopicRedeliverTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TopicReplicationTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TransientQueueRedeliverTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.*</exclude>
-                                <exclude>org/apache/activemq/usecases/UnlimitedEnqueueTest.*</exclude>
-                                <exclude>org/apache/activemq/util/DataByteArrayInputStreamTest.*</exclude>
-                                <exclude>org/apache/activemq/util/HttpBlobTest.*</exclude>
-                                <exclude>org/apache/activemq/util/LRUCacheTest.*</exclude>
-                                <exclude>org/apache/activemq/web/AjaxTest.*</exclude>
-                                <exclude>org/apache/activemq/web/RestTest.*</exclude>
-                                <exclude>org/apache/activemq/xbean/ConnectorXBeanConfigTest.*</exclude>
-                                <exclude>org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.*</exclude>
-                                <exclude>org/apache/activemq/xbean/XBeanXmlTest.*</exclude>
-                                <exclude>org/apache/bugs/AMQ1730Test.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/bugs/LoadBalanceTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/disk/index/HashIndexTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/disk/index/ListIndexTest.*</exclude>
-                                <exclude>org/apache/activemq/store/kahadb/disk/util/DataByteArrayInputStreamTest.*</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    <profile>
-      <id>openwire-generate</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>activemq-openwire-generator</artifactId>
-          <version>${project.version}</version>
-          <optional>true</optional>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default</id>
-                <phase>generate-sources</phase>
-                <configuration>
-                  <tasks>
-                    <echo>Running OpenWire Generator</echo>
-                    <taskdef name="generate" classname="org.apache.activemq.openwire.tool.JavaGeneratorTask" classpathref="maven.compile.classpath" />
-                    <generate version="9" basedir="${basedir}" />
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- To generate the XBean meta-data, run: mvn -P xbean-generate clean process-classes -->
-    <profile>
-      <id>xbean-generate</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>maven-xbean-plugin</artifactId>
-            <version>3.12</version>
-            <executions>
-              <execution>
-              <phase>process-classes</phase>
-                <configuration>
-                  <includes>
-                    <include>${basedir}/../activemq-leveldb/src/main/java</include>
-                  </includes>
-                  <classPathIncludes>
-                    <classPathInclude>${basedir}/../activemq-leveldb/target/classes</classPathInclude>
-                  </classPathIncludes>
-                  <strictXsdOrder>false</strictXsdOrder>
-                  <namespace>http://activemq.apache.org/schema/core</namespace>
-                  <schema>${basedir}/src/main/resources/activemq.xsd</schema>
-                  <outputDir>${basedir}/src/main/resources</outputDir>
-                  <generateSpringSchemasFile>false</generateSpringSchemasFile>
-                  <excludedClasses>org.apache.activemq.broker.jmx.AnnotatedMBean,org.apache.activemq.broker.jmx.DestinationViewMBean</excludedClasses>
-                </configuration>
-                <goals>
-                  <goal>mapping</goal>
-                </goals>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>com.thoughtworks.qdox</groupId>
-                <artifactId>qdox</artifactId>
-                <version>1.12</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

activemq-kahadb-store/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -90,9 +91,9 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.jettison</groupId>
+      <groupId>org.codehaus.jettison</groupId>
-        <artifactId>jettison</artifactId>
+      <artifactId>jettison</artifactId>
-        <optional>true</optional>
+      <optional>true</optional>
     </dependency>
 
     <!-- for XML parsing -->
@@ -105,11 +106,6 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
@@ -147,22 +143,6 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>${project.basedir}/src/main/filtered-resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-
     <pluginManagement>
       <plugins>
         <!--This plugin's configuration is used to store Eclipse m2e settings only.
@@ -201,7 +181,7 @@
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
 
-           <systemProperties>
+          <systemProperties>
             <property>
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
@@ -217,16 +197,16 @@
               <value>file:target/test-classes/log4j.properties</value>
             </property>
             -->
-           </systemProperties>
+          </systemProperties>
-           <includes>
+          <includes>
-             <include>**/*Test.*</include>
+            <include>**/*Test.*</include>
-           </includes>
+          </includes>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.activemq.protobuf</groupId>
         <artifactId>activemq-protobuf</artifactId>
-         <executions>
+        <executions>
           <execution>
             <goals>
               <goal>compile</goal>

activemq-karaf-itest/pom.xml

@@ -15,9 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -31,35 +30,31 @@
   <name>ActiveMQ :: Karaf Integration Tests</name>
   <description>Performs Karaf compliance integration tests</description>
 
-    <properties>
+  <properties>
-      <pax-exam-version>2.6.0</pax-exam-version>
+    <pax-exam-version>2.6.0</pax-exam-version>
-    </properties>
+  </properties>
 
   <dependencies>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-client</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-karaf</artifactId>
       <scope>test</scope>
     </dependency>
-
+    <dependency>
-      <dependency>
+      <groupId>org.ops4j.pax.logging</groupId>
-           <groupId>org.ops4j.pax.logging</groupId>
+      <artifactId>pax-logging-api</artifactId>
-           <artifactId>pax-logging-api</artifactId>
+      <version>1.6.2</version>
-           <version>1.6.2</version>
+    </dependency>
-      </dependency>
+    <dependency>
-      <dependency>
+      <groupId>org.ops4j.pax.logging</groupId>
-           <groupId>org.ops4j.pax.logging</groupId>
+      <artifactId>pax-logging-service</artifactId>
-           <artifactId>pax-logging-service</artifactId>
+      <version>1.6.2</version>
-           <version>1.6.2</version>
+    </dependency>
-      </dependency>
-
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit4</artifactId>
@@ -166,24 +161,23 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
     <plugins>
-        <!-- generate dependencies versions -->
+      <!-- generate dependencies versions -->
-        <plugin>
+      <plugin>
-            <groupId>org.apache.servicemix.tooling</groupId>
+        <groupId>org.apache.servicemix.tooling</groupId>
-            <artifactId>depends-maven-plugin</artifactId>
+        <artifactId>depends-maven-plugin</artifactId>
-            <executions>
+        <executions>
-                <execution>
+          <execution>
-                    <id>generate-depends-file</id>
+            <id>generate-depends-file</id>
-                    <goals>
+            <goals>
-                        <goal>generate-depends-file</goal>
+              <goal>generate-depends-file</goal>
-                    </goals>
+            </goals>
-                </execution>
+          </execution>
-            </executions>
+        </executions>
-        </plugin>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
@@ -191,7 +185,7 @@
           <redirectTestOutputToFile>false</redirectTestOutputToFile>
           <argLine>-Xmx256m</argLine>
           <excludes>
-            <!--<exclude>**/*Cxf*.*</exclude>-->
+          <!--<exclude>**/*Cxf*.*</exclude>-->
           </excludes>
           <systemPropertyVariables>
             <activemqVersion>${project.version}</activemqVersion>
@@ -199,7 +193,6 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
-
     </plugins>
   </build>
 

activemq-karaf/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -40,18 +41,17 @@
     <karaf-version>2.2.9</karaf-version>
   </properties>
 
-    <dependencies>
+  <dependencies>
-     <dependency>
+    <dependency>
-          <groupId>org.ops4j.pax.logging</groupId>
+      <groupId>org.ops4j.pax.logging</groupId>
-          <artifactId>pax-logging-api</artifactId>
+      <artifactId>pax-logging-api</artifactId>
-          <version>1.6.2</version>
+      <version>1.6.2</version>
-     </dependency>
+    </dependency>
-     <dependency>
+    <dependency>
-          <groupId>org.ops4j.pax.logging</groupId>
+      <groupId>org.ops4j.pax.logging</groupId>
-          <artifactId>pax-logging-service</artifactId>
+      <artifactId>pax-logging-service</artifactId>
-          <version>1.6.2</version>
+      <version>1.6.2</version>
-     </dependency>
+    </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -90,29 +90,29 @@
       <version>${karaf-version}</version>
     </dependency>
     <dependency>
-        <groupId>org.osgi</groupId>
+      <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
+      <artifactId>org.osgi.core</artifactId>
-        <scope>provided</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-http</artifactId>
+      <artifactId>activemq-http</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-log4j-appender</artifactId>
+      <artifactId>activemq-log4j-appender</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-console</artifactId>
+      <artifactId>activemq-console</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-pool</artifactId>
+      <artifactId>activemq-pool</artifactId>
     </dependency>
     <!-- used for testing -->
     <dependency>
@@ -121,6 +121,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <resources>
       <resource>
@@ -133,52 +134,52 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
-           <execution>
+          <execution>
-              <id>filter</id>
+            <id>filter</id>
-              <phase>generate-resources</phase>
+            <phase>generate-resources</phase>
-              <goals>
+            <goals>
-                <goal>resources</goal>
+              <goal>resources</goal>
-              </goals>
+            </goals>
-           </execution>
+          </execution>
         </executions>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
+        <artifactId>build-helper-maven-plugin</artifactId>
-          <executions>
+        <executions>
-            <execution>
+          <execution>
-              <id>attach-artifacts</id>
+            <id>attach-artifacts</id>
-              <phase>package</phase>
+            <phase>package</phase>
-              <goals>
+            <goals>
-                <goal>attach-artifact</goal>
+              <goal>attach-artifact</goal>
-              </goals>
+            </goals>
-              <configuration>
+            <configuration>
-                <artifacts>
+              <artifacts>
-                  <artifact>
+                <artifact>
-                    <file>target/classes/features.xml</file>
+                  <file>target/classes/features.xml</file>
-                     <type>xml</type>
+                  <type>xml</type>
-                     <classifier>features</classifier>
+                  <classifier>features</classifier>
-                   </artifact>
+                </artifact>
-                 </artifacts>
+              </artifacts>
-               </configuration>
+            </configuration>
-             </execution>
+          </execution>
-         </executions>
+        </executions>
-       </plugin>
+      </plugin>
-       <plugin>
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
-            <instructions>
+          <instructions>
-                <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                <Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
+            <Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
-                <Import-Package>
+            <Import-Package>
-                  org.apache.felix.gogo.commands,
+              org.apache.felix.gogo.commands,
-                  *
+              *
-                </Import-Package>
+            </Import-Package>
-                <Private-Package>!*</Private-Package>
+            <Private-Package>!*</Private-Package>
-                <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-                <Embed-Transitive>true</Embed-Transitive>
+            <Embed-Transitive>true</Embed-Transitive>
-            </instructions>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>

activemq-leveldb-store/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -40,7 +41,6 @@
       <version>${scala-version}</version>
       <scope>compile</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -51,31 +51,26 @@
       <artifactId>slf4j-api</artifactId>
       <scope>compile</scope>
     </dependency>
-
     <dependency>
       <groupId>org.fusesource.hawtbuf</groupId>
       <artifactId>hawtbuf-proto</artifactId>
       <version>${hawtbuf-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.fusesource.hawtdispatch</groupId>
       <artifactId>hawtdispatch-scala</artifactId>
       <version>${hawtdispatch-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.iq80.leveldb</groupId>
       <artifactId>leveldb-api</artifactId>
       <version>${leveldb-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.iq80.leveldb</groupId>
       <artifactId>leveldb</artifactId>
       <version>${leveldb-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>
       <artifactId>leveldbjni-osx</artifactId>
@@ -108,14 +103,12 @@
       <artifactId>snappy-java</artifactId>
       <version>1.0.3</version>
     </dependency>
-
     <dependency>
       <groupId>org.iq80.snappy</groupId>
       <artifactId>snappy</artifactId>
       <version>0.2</version>
       <optional>true</optional>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
@@ -126,7 +119,6 @@
       <artifactId>jackson-mapper-asl</artifactId>
       <version>${jackson-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
@@ -209,7 +201,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-kahadb-store</artifactId>
@@ -271,7 +262,6 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala-version}</artifactId>
@@ -283,11 +273,9 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
-
     <plugins>
       <plugin>
         <groupId>net.alchim31.maven</groupId>
@@ -296,24 +284,25 @@
         <executions>
           <execution>
             <id>compile</id>
-            <goals><goal>compile</goal> </goals>
+            <goals>
+              <goal>compile</goal>
+            </goals>
             <phase>compile</phase>
           </execution>
           <execution>
             <id>test-compile</id>
             <goals>
-            <goal>testCompile</goal>
+              <goal>testCompile</goal>
             </goals>
             <phase>test-compile</phase>
           </execution>
           <execution>
             <phase>process-resources</phase>
             <goals>
-            <goal>compile</goal>
+              <goal>compile</goal>
             </goals>
           </execution>
         </executions>
-
         <configuration>
           <jvmArgs>
             <jvmArg>-Xmx1024m</jvmArg>
@@ -332,11 +321,9 @@
           </compilerPlugins>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-
         <configuration>
           <!-- we must turn off the use of system class loader so our tests can find stuff - otherwise ScalaSupport compiler can't find stuff -->
           <useSystemClassLoader>false</useSystemClassLoader>
@@ -357,7 +344,7 @@
         <configuration>
           <type>alt</type>
         </configuration>
-         <executions>
+        <executions>
           <execution>
             <goals>
               <goal>compile</goal>
@@ -373,7 +360,9 @@
           <execution>
             <id>all</id>
             <phase>package</phase>
-            <goals><goal>uberize</goal></goals>
+            <goals>
+              <goal>uberize</goal>
+            </goals>
           </execution>
         </executions>
         <configuration>
@@ -436,9 +425,9 @@
                   <action>
                     <ignore />
                   </action>
-              </pluginExecution>
+                </pluginExecution>
-              <pluginExecution>
+                <pluginExecution>
-                <pluginExecutionFilter>
+                  <pluginExecutionFilter>
                     <groupId>net.alchim31.maven</groupId>
                     <artifactId>scala-maven-plugin</artifactId>
                     <versionRange>[${scala-plugin-version},)</versionRange>

activemq-log4j-appender/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -31,7 +32,6 @@
   <description>ActiveMQ Log4j Appender</description>
 
   <dependencies>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-client</artifactId>
@@ -64,36 +64,36 @@
   </dependencies>
   <build>
     <plugins>
-        <plugin>
+      <plugin>
-            <artifactId>maven-jar-plugin</artifactId>
+        <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
+        <configuration>
-                <archive>
+          <archive>
-                    <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                </archive>
+          </archive>
-            </configuration>
+        </configuration>
-        </plugin>
+      </plugin>
-       <plugin>
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
-            <instructions>
+          <instructions>
-                <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                <Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
+            <Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
-                <Export-Package>
+            <Export-Package>
-                  org.apache.activemq.transport.util*;version=${project.version};-noimport:=;-split-package:=merge-last,
+              org.apache.activemq.transport.util*;version=${project.version};-noimport:=;-split-package:=merge-last,
-                </Export-Package>
+            </Export-Package>
-            </instructions>
+          </instructions>
         </configuration>
-           <executions>
+        <executions>
-               <execution>
+          <execution>
-                   <id>bundle-manifest</id>
+            <id>bundle-manifest</id>
-                   <phase>process-classes</phase>
+            <phase>process-classes</phase>
-                   <goals>
+            <goals>
-                       <goal>manifest</goal>
+              <goal>manifest</goal>
-                   </goals>
+            </goals>
-               </execution>
+          </execution>
-           </executions>
+        </executions>
-       </plugin>
+      </plugin>
       <!-- Configure which tests are included/excuded -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>

activemq-mqtt/pom.xml

@@ -30,11 +30,8 @@
   <name>ActiveMQ :: MQTT Protocol</name>
   <description>The ActiveMQ MQTT Protocol Implementation</description>
 
-  <properties>
-  </properties>
-
   <dependencies>
-    
+
     <!-- =============================== -->
     <!-- Required Dependencies -->
     <!-- =============================== -->
@@ -113,11 +110,6 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
@@ -245,6 +237,5 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
+
-  </profiles>
 </project>

activemq-openwire-generator/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +24,6 @@
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
     <version>5.8-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>activemq-openwire-generator</artifactId>

activemq-openwire-legacy/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,39 +31,11 @@
   <name>ActiveMQ :: Openwire Legacy Support</name>
   <description>The ActiveMQ Openwire Legacy Support Module</description>
 
-  <properties>
-    <surefire.argLine>-Xmx512M</surefire.argLine>
-  </properties>
-
   <dependencies>
-    <!-- =============================== -->
-    <!-- Required Dependencies -->
-    <!-- =============================== -->
-    <!--<dependency>-->
-      <!--<groupId>org.slf4j</groupId>-->
-      <!--<artifactId>slf4j-api</artifactId>-->
-    <!--</dependency>-->
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-client</artifactId>
     </dependency>
-
-    <!-- =============================== -->
-    <!-- Testing Dependencies            -->
-    <!-- =============================== -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
-  <build>
-  </build>
-
 </project>

activemq-osgi/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -113,23 +114,23 @@
       <artifactId>activemq-ra</artifactId>
     </dependency>
 
-      <dependency>
+    <dependency>
-        <groupId>${project.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
-        <artifactId>activemq-spring</artifactId>
+      <artifactId>activemq-spring</artifactId>
-      </dependency>
+    </dependency>
 
-      <dependency>
+    <dependency>
-          <groupId>org.osgi</groupId>
+      <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
+      <artifactId>org.osgi.core</artifactId>
-          <scope>provided</scope>
+      <scope>provided</scope>
-      </dependency>
+    </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>4.2.0</version>
+    </dependency>
 
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.compendium</artifactId>
-        <version>4.2.0</version>
-      </dependency>
-    
   </dependencies>
 
   <build>
@@ -183,9 +184,9 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-             <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
+            <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
-             <Embed-Dependency>*;groupId=org.apache.activemq;inline=META-INF/services/*</Embed-Dependency>
+            <Embed-Dependency>*;groupId=org.apache.activemq;inline=META-INF/services/*</Embed-Dependency>
-             <Embed-Transitive>true</Embed-Transitive>
+            <Embed-Transitive>true</Embed-Transitive>
           </instructions>
         </configuration>
       </plugin>

activemq-pool/pom.xml

@@ -6,16 +6,17 @@
   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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -58,7 +59,7 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-ra</artifactId>
       <optional>true</optional>
-    </dependency> 
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.components</groupId>
       <artifactId>geronimo-transaction</artifactId>
@@ -94,9 +95,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-    	<groupId>log4j</groupId>
+      <groupId>log4j</groupId>
-    	<artifactId>log4j</artifactId>
+      <artifactId>log4j</artifactId>
-    	<scope>test</scope>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

activemq-ra/pom.xml

@@ -6,16 +6,17 @@
   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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -40,8 +41,6 @@
   </properties>
 
   <dependencies>
-
-    <!-- activemq -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -50,7 +49,6 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-kahadb-store</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
@@ -148,5 +146,4 @@
     </plugins>
   </build>
 
-
 </project>

activemq-rar/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -62,108 +63,108 @@
           <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j</artifactId>
+          <artifactId>mx4j</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>geronimo</groupId>
+          <groupId>geronimo</groupId>
-           <artifactId>geronimo-kernel</artifactId>
+          <artifactId>geronimo-kernel</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>geronimo</groupId>
+          <groupId>geronimo</groupId>
-           <artifactId>geronimo-j2ee</artifactId>
+          <artifactId>geronimo-j2ee</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>axion</groupId>
+          <groupId>axion</groupId>
-           <artifactId>axion</artifactId>
+          <artifactId>axion</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>${project.groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
-           <artifactId>activemq-jaas</artifactId>
+          <artifactId>activemq-jaas</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>howl</groupId>
+          <groupId>howl</groupId>
-           <artifactId>howl-logger</artifactId>
+          <artifactId>howl-logger</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>activemq</groupId>
+          <groupId>activemq</groupId>
-           <artifactId>smackx</artifactId>
+          <artifactId>smackx</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>activemq</groupId>
+          <groupId>activemq</groupId>
-           <artifactId>smack</artifactId>
+          <artifactId>smack</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j-jmx</artifactId>
+          <artifactId>mx4j-jmx</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j-impl</artifactId>
+          <artifactId>mx4j-impl</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j-remote</artifactId>
+          <artifactId>mx4j-remote</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j-tools</artifactId>
+          <artifactId>mx4j-tools</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>qdox</groupId>
+          <groupId>qdox</groupId>
-           <artifactId>qdox</artifactId>
+          <artifactId>qdox</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>junit</groupId>
+          <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
+          <artifactId>junit</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>regexp</groupId>
+          <groupId>regexp</groupId>
-           <artifactId>regexp</artifactId>
+          <artifactId>regexp</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>javax.jmdns</groupId>
+          <groupId>javax.jmdns</groupId>
-           <artifactId>jmdns</artifactId>
+          <artifactId>jmdns</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xalan</groupId>
+          <groupId>xalan</groupId>
-           <artifactId>xalan</artifactId>
+          <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
+          <groupId>xmlbeans</groupId>
-           <artifactId>xbean</artifactId>
+          <artifactId>xbean</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
+          <groupId>xmlbeans</groupId>
-           <artifactId>xmlpublic</artifactId>
+          <artifactId>xmlpublic</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
+          <groupId>xmlbeans</groupId>
-           <artifactId>xbean_xpath</artifactId>
+          <artifactId>xbean_xpath</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xerces</groupId>
+          <groupId>xerces</groupId>
-           <artifactId>xercesImpl</artifactId>
+          <artifactId>xercesImpl</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xml-apis</groupId>
+          <groupId>xml-apis</groupId>
-           <artifactId>xml-apis</artifactId>
+          <artifactId>xml-apis</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>ant</groupId>
+          <groupId>ant</groupId>
-           <artifactId>ant</artifactId>
+          <artifactId>ant</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-collections</groupId>
+          <groupId>commons-collections</groupId>
-           <artifactId>commons-collections</artifactId>
+          <artifactId>commons-collections</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-primitives</groupId>
+          <groupId>commons-primitives</groupId>
-           <artifactId>commons-primitives</artifactId>
+          <artifactId>commons-primitives</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-pool</groupId>
+          <groupId>commons-pool</groupId>
-           <artifactId>commons-pool</artifactId>
+          <artifactId>commons-pool</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -196,108 +197,108 @@
           <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j</artifactId>
+          <artifactId>mx4j</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>geronimo</groupId>
+          <groupId>geronimo</groupId>
-           <artifactId>geronimo-kernel</artifactId>
+          <artifactId>geronimo-kernel</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>geronimo</groupId>
+          <groupId>geronimo</groupId>
-           <artifactId>geronimo-j2ee</artifactId>
+          <artifactId>geronimo-j2ee</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>axion</groupId>
+          <groupId>axion</groupId>
-           <artifactId>axion</artifactId>
+          <artifactId>axion</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>${project.groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
-           <artifactId>activemq-jaas</artifactId>
+          <artifactId>activemq-jaas</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>howl</groupId>
+          <groupId>howl</groupId>
-           <artifactId>howl-logger</artifactId>
+          <artifactId>howl-logger</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>activemq</groupId>
+          <groupId>activemq</groupId>
-           <artifactId>smackx</artifactId>
+          <artifactId>smackx</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>activemq</groupId>
+          <groupId>activemq</groupId>
-           <artifactId>smack</artifactId>
+          <artifactId>smack</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j-jmx</artifactId>
+          <artifactId>mx4j-jmx</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j-impl</artifactId>
+          <artifactId>mx4j-impl</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j-remote</artifactId>
+          <artifactId>mx4j-remote</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
+          <groupId>mx4j</groupId>
-           <artifactId>mx4j-tools</artifactId>
+          <artifactId>mx4j-tools</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>qdox</groupId>
+          <groupId>qdox</groupId>
-           <artifactId>qdox</artifactId>
+          <artifactId>qdox</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>junit</groupId>
+          <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
+          <artifactId>junit</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>regexp</groupId>
+          <groupId>regexp</groupId>
-           <artifactId>regexp</artifactId>
+          <artifactId>regexp</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>javax.jmdns</groupId>
+          <groupId>javax.jmdns</groupId>
-           <artifactId>jmdns</artifactId>
+          <artifactId>jmdns</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xalan</groupId>
+          <groupId>xalan</groupId>
-           <artifactId>xalan</artifactId>
+          <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
+          <groupId>xmlbeans</groupId>
-           <artifactId>xbean</artifactId>
+          <artifactId>xbean</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
+          <groupId>xmlbeans</groupId>
-           <artifactId>xmlpublic</artifactId>
+          <artifactId>xmlpublic</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
+          <groupId>xmlbeans</groupId>
-           <artifactId>xbean_xpath</artifactId>
+          <artifactId>xbean_xpath</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xerces</groupId>
+          <groupId>xerces</groupId>
-           <artifactId>xercesImpl</artifactId>
+          <artifactId>xercesImpl</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xml-apis</groupId>
+          <groupId>xml-apis</groupId>
-           <artifactId>xml-apis</artifactId>
+          <artifactId>xml-apis</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>ant</groupId>
+          <groupId>ant</groupId>
-           <artifactId>ant</artifactId>
+          <artifactId>ant</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-collections</groupId>
+          <groupId>commons-collections</groupId>
-           <artifactId>commons-collections</artifactId>
+          <artifactId>commons-collections</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-primitives</groupId>
+          <groupId>commons-primitives</groupId>
-           <artifactId>commons-primitives</artifactId>
+          <artifactId>commons-primitives</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-pool</groupId>
+          <groupId>commons-pool</groupId>
-           <artifactId>commons-pool</artifactId>
+          <artifactId>commons-pool</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -328,8 +329,8 @@
       <artifactId>spring-core</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
+      <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
+      <artifactId>spring-context</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -388,32 +389,31 @@
     </plugins>
   </build>
 
-    <profiles>
+  <profiles>
-        <profile>
+    <profile>
-            <id>deploy</id>
+      <id>deploy</id>
-            <build>
+      <build>
-            <defaultGoal>deploy</defaultGoal>
+        <defaultGoal>deploy</defaultGoal>
-            <plugins>
+        <plugins>
-                <plugin>
+          <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
+            <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
+            <artifactId>maven-source-plugin</artifactId>
-                    <version>2.1.2</version>
+            <version>2.1.2</version>
-                    <configuration>
+            <configuration>
-                        <attach>false</attach>
+              <attach>false</attach>
-                    </configuration>
+            </configuration>
-                    <executions>
+            <executions>
-                        <execution>
+              <execution>
-                            <id>attach-sources</id>
+                <id>attach-sources</id>
-                            <goals>
+                <goals>
-                                <goal>jar</goal>
+                  <goal>jar</goal>
-                            </goals>
+                </goals>
-                        </execution>
+              </execution>
-                    </executions>
+            </executions>
-                </plugin>
+          </plugin>
-            </plugins>
+        </plugins>
-          </build>
+      </build>
-        </profile>
+    </profile>
-    </profiles>
+  </profiles>
 
 </project>
-

activemq-run/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +31,6 @@
   <description>activemq.jar for starting a standalone ActiveMQ broker</description>
 
   <dependencies>
-    <!-- activemq -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>

activemq-spring/pom.xml

@@ -6,16 +6,17 @@
   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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -64,7 +65,6 @@
       <artifactId>activemq-kahadb-store</artifactId>
       <optional>true</optional>
     </dependency>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-amq-store</artifactId>
@@ -75,7 +75,6 @@
       <artifactId>activeio-core</artifactId>
       <optional>true</optional>
     </dependency>
-    
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-leveldb-store</artifactId>
@@ -139,59 +138,58 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-    	<groupId>log4j</groupId>
+      <groupId>log4j</groupId>
-    	<artifactId>log4j</artifactId>
+      <artifactId>log4j</artifactId>
-    	<scope>test</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-         <groupId>org.jencks</groupId>
+      <groupId>org.jencks</groupId>
-         <artifactId>jencks</artifactId>
+      <artifactId>jencks</artifactId>
-         <version>2.2</version>
+      <version>2.2</version>
-         <scope>test</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-         <groupId>org.slf4j</groupId>
+      <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-log4j12</artifactId>
-         <scope>test</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-         <groupId>${project.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
-         <artifactId>activemq-ra</artifactId>
+      <artifactId>activemq-ra</artifactId>
-         <scope>test</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-         <groupId>org.osgi</groupId>
+      <groupId>org.osgi</groupId>
-         <artifactId>org.osgi.core</artifactId>
+      <artifactId>org.osgi.core</artifactId>
-         <scope>provided</scope>
+      <scope>provided</scope>
-         <optional>true</optional>
+      <optional>true</optional>
     </dependency>
     <dependency>
-        <groupId>org.springframework.osgi</groupId>
+      <groupId>org.springframework.osgi</groupId>
-        <artifactId>spring-osgi-core</artifactId>
+      <artifactId>spring-osgi-core</artifactId>
-        <scope>provided</scope>
+      <scope>provided</scope>
-        <optional>true</optional>
+      <optional>true</optional>
-        <exclusions>
+      <exclusions>
-            <exclusion>
+        <exclusion>
-                <groupId>org.springframework</groupId>
+          <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.context</artifactId>
+          <artifactId>org.springframework.context</artifactId>
-            </exclusion>
+        </exclusion>
-            <exclusion>
+        <exclusion>
-                <groupId>org.springframework</groupId>
+          <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.beans</artifactId>
+          <artifactId>org.springframework.beans</artifactId>
-            </exclusion>
+        </exclusion>
-            <exclusion>
+        <exclusion>
-                <groupId>org.springframework</groupId>
+          <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.aop</artifactId>
+          <artifactId>org.springframework.aop</artifactId>
-            </exclusion>
+        </exclusion>
-            <exclusion>
+        <exclusion>
-                <groupId>org.springframework</groupId>
+          <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.core</artifactId>
+          <artifactId>org.springframework.core</artifactId>
-            </exclusion>
+        </exclusion>
-        </exclusions>
+      </exclusions>
-    </dependency>    
+    </dependency>
-    
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>
@@ -200,7 +198,7 @@
         <version>3.12</version>
         <executions>
           <execution>
-          <phase>process-classes</phase>
+            <phase>process-classes</phase>
             <configuration>
               <includes>
                 <include>${basedir}/../activemq-client/src/main/java</include>
@@ -234,5 +232,5 @@
       </plugin>
     </plugins>
   </build>
-  
+
 </project>

activemq-stomp/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,9 +31,6 @@
   <name>ActiveMQ :: STOMP Protocol</name>
   <description>The ActiveMQ STOMP Protocol Implementation</description>
 
-  <properties>
-  </properties>
-
   <dependencies>
 
     <!-- =============================== -->
@@ -46,7 +44,6 @@
     <!-- =============================== -->
     <!-- Optional Dependencies           -->
     <!-- =============================== -->
-
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
@@ -144,6 +141,4 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-  </profiles>
 </project>

activemq-tooling/activemq-maven-plugin/pom.xml

@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -72,6 +72,7 @@
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

activemq-tooling/activemq-memtest-maven-plugin/pom.xml

@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>

activemq-tooling/activemq-perf-maven-plugin/pom.xml

@@ -14,63 +14,64 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
+  <parent>
-        <groupId>org.apache.activemq.tooling</groupId>
+    <groupId>org.apache.activemq.tooling</groupId>
-        <artifactId>activemq-tooling</artifactId>
+    <artifactId>activemq-tooling</artifactId>
-        <version>5.8-SNAPSHOT</version>
+    <version>5.8-SNAPSHOT</version>
-    </parent>
+  </parent>
 
-    <artifactId>activemq-perf-maven-plugin</artifactId>
+  <artifactId>activemq-perf-maven-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
+  <packaging>maven-plugin</packaging>
-    <name>ActiveMQ :: Performance Test Plugin</name>
+  <name>ActiveMQ :: Performance Test Plugin</name>
 
-    <dependencies>
+  <dependencies>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
+      <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
+      <version>2.0</version>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-console</artifactId>
+      <artifactId>activemq-console</artifactId>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
-            <artifactId>activeio-core</artifactId>
+      <artifactId>activeio-core</artifactId>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.derby</groupId>
+      <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
+      <artifactId>derby</artifactId>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.derby</groupId>
+      <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
+      <artifactId>derbynet</artifactId>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
+      <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
+      <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>junit</groupId>
+      <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+      <artifactId>junit</artifactId>
-            <scope>test</scope>
+      <scope>test</scope>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.slf4j</groupId>
+      <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+      <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-version}</version>
+      <version>${slf4j-version}</version>
-        </dependency>
+    </dependency>
-    </dependencies>
+  </dependencies>
 </project>

activemq-tooling/pom.xml

@@ -15,7 +15,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -35,5 +36,4 @@
     <module>activemq-perf-maven-plugin</module>
     <module>activemq-maven-plugin</module>
   </modules>
-
 </project>

activemq-web-console/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,11 +31,11 @@
   <name>ActiveMQ :: Web Console</name>
   <description>Web Console for ActiveMQ</description>
 
-    <properties>
+  <properties>
-        <jetty.port>8080</jetty.port>
+    <jetty.port>8080</jetty.port>
-    </properties>
+  </properties>
 
-    <build>
+  <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -45,7 +46,7 @@
             WEB-INF/lib/jetty*.jar,
             WEB-INF/lib/servlet*.jar
           </packagingExcludes>
-            <archive>
+          <archive>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
         </configuration>
@@ -98,7 +99,7 @@
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
       </plugin>
-        <plugin>
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <executions>
@@ -124,28 +125,28 @@
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
             <Import-Package>
-                org.xml.sax,
+              org.xml.sax,
-                org.xml.sax.helpers,
+              org.xml.sax.helpers,
-                javax.xml.parsers,
+              javax.xml.parsers,
-                javax.xml.transform,
+              javax.xml.transform,
-                javax.management.remote,
+              javax.management.remote,
-                javax.naming,
+              javax.naming,
-                org.w3c.dom,
+              org.w3c.dom,
-                javax.servlet,
+              javax.servlet,
-                javax.servlet.http,
+              javax.servlet.http,
-                javax.servlet.resources,
+              javax.servlet.resources,
-                javax.servlet.jsp,
+              javax.servlet.jsp,
-                javax.servlet.jsp.tagext,
+              javax.servlet.jsp.tagext,
-                javax.servlet.jsp.el,
+              javax.servlet.jsp.el,
-                javax.management,
+              javax.management,
-                javax.management.openmbean,
+              javax.management.openmbean,
-                javax.net,
+              javax.net,
-                org.apache.commons.logging;version="[1.1,2)";resolution:=optional,
+              org.apache.commons.logging;version="[1.1,2)";resolution:=optional,
-                org.slf4j;version="[1.6,2)";resolution:=optional,
+              org.slf4j;version="[1.6,2)";resolution:=optional,
-                org.slf4j.spi;version="[1.6,2)";resolution:=optional,
+              org.slf4j.spi;version="[1.6,2)";resolution:=optional,
-                org.apache.log4j;version="[1.2.14,2)";resolution:=optional,
+              org.apache.log4j;version="[1.2.14,2)";resolution:=optional,
-                org.apache.log4j.spi;version="[1.2.14,2)";resolution:=optional,
+              org.apache.log4j.spi;version="[1.2.14,2)";resolution:=optional,
-                org.eclipse.jetty.continuation;resolution:=optional
+              org.eclipse.jetty.continuation;resolution:=optional
             </Import-Package>
           </instructions>
         </configuration>
@@ -202,8 +203,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-       <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
-       <artifactId>activemq-client</artifactId>
+      <artifactId>activemq-client</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
@@ -221,7 +222,6 @@
       <artifactId>core</artifactId>
       <version>3.1.1</version>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -230,13 +230,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
-
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
 
-
     <!-- SiteMesh for layout -->
     <dependency>
       <groupId>opensymphony</groupId>
@@ -253,13 +251,11 @@
       <artifactId>standard</artifactId>
     </dependency>
 
-
     <!-- XStream marshalling -->
     <dependency>
       <groupId>xpp3</groupId>
       <artifactId>xpp3</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>

activemq-web-demo/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -50,7 +51,6 @@
   </build>
 
   <dependencies>
-
     <!-- j2ee jars -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -95,7 +95,6 @@
       <artifactId>activemq-jaas</artifactId>
       <optional>true</optional>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -114,12 +113,10 @@
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>
-
     <dependency>
       <groupId>xpp3</groupId>
       <artifactId>xpp3</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
@@ -131,7 +128,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
@@ -144,7 +140,6 @@
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
     </dependency>
-
   </dependencies>
 
   <properties>

activemq-web/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -121,10 +122,10 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-      <dependency>
+    <dependency>
-          <groupId>org.slf4j</groupId>
+      <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-log4j12</artifactId>
-          <scope>test</scope>
+      <scope>test</scope>
-      </dependency>
+    </dependency>
   </dependencies>
 </project>

activemq-xmpp/pom.xml

@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +31,6 @@
   <name>ActiveMQ :: XMPP</name>
 
   <dependencies>
-    <!-- activemq -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-client</artifactId>
@@ -39,7 +39,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>woodstox-core-asl</artifactId>
@@ -89,7 +88,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>

assembly/pom.xml

@@ -54,7 +54,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-client</artifactId>
@@ -76,7 +75,6 @@
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
     </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-leveldb-store</artifactId>
@@ -93,7 +91,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-jdbc-store</artifactId>
     </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-mqtt</artifactId>
@@ -106,7 +103,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-amqp</artifactId>
     </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-log4j-appender</artifactId>
@@ -115,7 +111,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-http</artifactId>
     </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
@@ -219,12 +214,10 @@
       <groupId>xpp3</groupId>
       <artifactId>xpp3</artifactId>
     </dependency>
-
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -287,7 +280,6 @@
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all-server</artifactId>
@@ -342,13 +334,11 @@
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt-spring3</artifactId>
       <version>${jasypt-version}</version>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -381,11 +371,9 @@
       <artifactId>json-simple</artifactId>
       <version>1.1</version>
     </dependency>
-
   </dependencies>
 
   <build>
-
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -506,5 +494,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>