activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1439680 [4/4] - in /activemq/trunk: activemq-amqp/ activemq-blueprint/ activemq-broker/ activemq-camel/ activemq-client/ activemq-console/ activemq-core/ activemq-fileserver/ activemq-http/ activemq-itests-spring31/ activemq-jaas/ activemq...
Date Mon, 28 Jan 2013 22:44:26 GMT
Modified: activemq/trunk/activemq-karaf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-     <dependency>
-          <groupId>org.ops4j.pax.logging</groupId>
-          <artifactId>pax-logging-api</artifactId>
-          <version>1.6.2</version>
-     </dependency>
-     <dependency>
-          <groupId>org.ops4j.pax.logging</groupId>
-          <artifactId>pax-logging-service</artifactId>
-          <version>1.6.2</version>
-     </dependency>
-
+  <dependencies>
+    <dependency>
+      <groupId>org.ops4j.pax.logging</groupId>
+      <artifactId>pax-logging-api</artifactId>
+      <version>1.6.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.logging</groupId>
+      <artifactId>pax-logging-service</artifactId>
+      <version>1.6.2</version>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -90,29 +90,29 @@
       <version>${karaf-version}</version>
     </dependency>
     <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <scope>provided</scope>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-http</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-http</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-log4j-appender</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-log4j-appender</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-console</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-console</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-pool</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <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>
-              <id>filter</id>
-              <phase>generate-resources</phase>
-              <goals>
-                <goal>resources</goal>
-              </goals>
-           </execution>
+          <execution>
+            <id>filter</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>attach-artifacts</id>
-              <phase>package</phase>
-              <goals>
-                <goal>attach-artifact</goal>
-              </goals>
-              <configuration>
-                <artifacts>
-                  <artifact>
-                    <file>target/classes/features.xml</file>
-                     <type>xml</type>
-                     <classifier>features</classifier>
-                   </artifact>
-                 </artifacts>
-               </configuration>
-             </execution>
-         </executions>
-       </plugin>
-       <plugin>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>target/classes/features.xml</file>
+                  <type>xml</type>
+                  <classifier>features</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
-            <instructions>
-                <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                <Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
-                <Import-Package>
-                  org.apache.felix.gogo.commands,
-                  *
-                </Import-Package>
-                <Private-Package>!*</Private-Package>
-                <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-                <Embed-Transitive>true</Embed-Transitive>
-            </instructions>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
+            <Import-Package>
+              org.apache.felix.gogo.commands,
+              *
+            </Import-Package>
+            <Private-Package>!*</Private-Package>
+            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+            <Embed-Transitive>true</Embed-Transitive>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>

Modified: activemq/trunk/activemq-leveldb-store/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/pom.xml (original)
+++ activemq/trunk/activemq-leveldb-store/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-                <pluginExecutionFilter>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
                     <groupId>net.alchim31.maven</groupId>
                     <artifactId>scala-maven-plugin</artifactId>
                     <versionRange>[${scala-plugin-version},)</versionRange>

Modified: activemq/trunk/activemq-log4j-appender/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-log4j-appender/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-log4j-appender/pom.xml (original)
+++ activemq/trunk/activemq-log4j-appender/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-                <archive>
-                    <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                </archive>
-            </configuration>
-        </plugin>
-       <plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
-            <instructions>
-                <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                <Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
-                <Export-Package>
-                  org.apache.activemq.transport.util*;version=${project.version};-noimport:=;-split-package:=merge-last,
-                </Export-Package>
-            </instructions>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
+            <Export-Package>
+              org.apache.activemq.transport.util*;version=${project.version};-noimport:=;-split-package:=merge-last,
+            </Export-Package>
+          </instructions>
         </configuration>
-           <executions>
-               <execution>
-                   <id>bundle-manifest</id>
-                   <phase>process-classes</phase>
-                   <goals>
-                       <goal>manifest</goal>
-                   </goals>
-               </execution>
-           </executions>
-       </plugin>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <!-- Configure which tests are included/excuded -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>

Modified: activemq/trunk/activemq-mqtt/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-mqtt/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-mqtt/pom.xml (original)
+++ activemq/trunk/activemq-mqtt/pom.xml Mon Jan 28 22:44:25 2013
@@ -30,11 +30,8 @@
   <name>ActiveMQ :: MQTT Protocol</name>
   <description>The ActiveMQ MQTT Protocol Implementation</description>
 
-  <properties>
-  </properties>
-
   <dependencies>
-    
+
     <!-- =============================== -->
     <!-- Required Dependencies -->
     <!-- =============================== -->
@@ -114,11 +111,6 @@
       <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>
       <optional>true</optional>
@@ -245,6 +237,5 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-  </profiles>
+
 </project>

Modified: activemq/trunk/activemq-openwire-generator/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-openwire-generator/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-openwire-generator/pom.xml (original)
+++ activemq/trunk/activemq-openwire-generator/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/activemq-openwire-legacy/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-openwire-legacy/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-openwire-legacy/pom.xml (original)
+++ activemq/trunk/activemq-openwire-legacy/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>activemq-spring</artifactId>
-      </dependency>
-
-      <dependency>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-          <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.compendium</artifactId>
-        <version>4.2.0</version>
-      </dependency>
-    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-spring</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </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>
-             <Embed-Dependency>*;groupId=org.apache.activemq;inline=META-INF/services/*</Embed-Dependency>
-             <Embed-Transitive>true</Embed-Transitive>
+            <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
+            <Embed-Dependency>*;groupId=org.apache.activemq;inline=META-INF/services/*</Embed-Dependency>
+            <Embed-Transitive>true</Embed-Transitive>
           </instructions>
         </configuration>
       </plugin>

Modified: activemq/trunk/activemq-pool/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-pool/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-pool/pom.xml (original)
+++ activemq/trunk/activemq-pool/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-    	<artifactId>log4j</artifactId>
-    	<scope>test</scope>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

Modified: activemq/trunk/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/pom.xml (original)
+++ activemq/trunk/activemq-ra/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-rar/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-rar/pom.xml (original)
+++ activemq/trunk/activemq-rar/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-           <artifactId>mx4j</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>geronimo</groupId>
-           <artifactId>geronimo-kernel</artifactId>
+          <groupId>geronimo</groupId>
+          <artifactId>geronimo-kernel</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>geronimo</groupId>
-           <artifactId>geronimo-j2ee</artifactId>
+          <groupId>geronimo</groupId>
+          <artifactId>geronimo-j2ee</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>axion</groupId>
-           <artifactId>axion</artifactId>
+          <groupId>axion</groupId>
+          <artifactId>axion</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>activemq-jaas</artifactId>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-jaas</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>howl</groupId>
-           <artifactId>howl-logger</artifactId>
+          <groupId>howl</groupId>
+          <artifactId>howl-logger</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>activemq</groupId>
-           <artifactId>smackx</artifactId>
+          <groupId>activemq</groupId>
+          <artifactId>smackx</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>activemq</groupId>
-           <artifactId>smack</artifactId>
+          <groupId>activemq</groupId>
+          <artifactId>smack</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-jmx</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j-jmx</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-impl</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j-impl</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-remote</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j-remote</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-tools</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j-tools</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>qdox</groupId>
-           <artifactId>qdox</artifactId>
+          <groupId>qdox</groupId>
+          <artifactId>qdox</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>regexp</groupId>
-           <artifactId>regexp</artifactId>
+          <groupId>regexp</groupId>
+          <artifactId>regexp</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>javax.jmdns</groupId>
-           <artifactId>jmdns</artifactId>
+          <groupId>javax.jmdns</groupId>
+          <artifactId>jmdns</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xalan</groupId>
-           <artifactId>xalan</artifactId>
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
-           <artifactId>xbean</artifactId>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xbean</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
-           <artifactId>xmlpublic</artifactId>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xmlpublic</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
-           <artifactId>xbean_xpath</artifactId>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xbean_xpath</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xerces</groupId>
-           <artifactId>xercesImpl</artifactId>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xml-apis</groupId>
-           <artifactId>xml-apis</artifactId>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>ant</groupId>
-           <artifactId>ant</artifactId>
+          <groupId>ant</groupId>
+          <artifactId>ant</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-collections</groupId>
-           <artifactId>commons-collections</artifactId>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-primitives</groupId>
-           <artifactId>commons-primitives</artifactId>
+          <groupId>commons-primitives</groupId>
+          <artifactId>commons-primitives</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-pool</groupId>
-           <artifactId>commons-pool</artifactId>
+          <groupId>commons-pool</groupId>
+          <artifactId>commons-pool</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -196,108 +197,108 @@
           <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>geronimo</groupId>
-           <artifactId>geronimo-kernel</artifactId>
+          <groupId>geronimo</groupId>
+          <artifactId>geronimo-kernel</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>geronimo</groupId>
-           <artifactId>geronimo-j2ee</artifactId>
+          <groupId>geronimo</groupId>
+          <artifactId>geronimo-j2ee</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>axion</groupId>
-           <artifactId>axion</artifactId>
+          <groupId>axion</groupId>
+          <artifactId>axion</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>activemq-jaas</artifactId>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-jaas</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>howl</groupId>
-           <artifactId>howl-logger</artifactId>
+          <groupId>howl</groupId>
+          <artifactId>howl-logger</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>activemq</groupId>
-           <artifactId>smackx</artifactId>
+          <groupId>activemq</groupId>
+          <artifactId>smackx</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>activemq</groupId>
-           <artifactId>smack</artifactId>
+          <groupId>activemq</groupId>
+          <artifactId>smack</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-jmx</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j-jmx</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-impl</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j-impl</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-remote</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j-remote</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-tools</artifactId>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j-tools</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>qdox</groupId>
-           <artifactId>qdox</artifactId>
+          <groupId>qdox</groupId>
+          <artifactId>qdox</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>regexp</groupId>
-           <artifactId>regexp</artifactId>
+          <groupId>regexp</groupId>
+          <artifactId>regexp</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>javax.jmdns</groupId>
-           <artifactId>jmdns</artifactId>
+          <groupId>javax.jmdns</groupId>
+          <artifactId>jmdns</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xalan</groupId>
-           <artifactId>xalan</artifactId>
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
-           <artifactId>xbean</artifactId>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xbean</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
-           <artifactId>xmlpublic</artifactId>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xmlpublic</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xmlbeans</groupId>
-           <artifactId>xbean_xpath</artifactId>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xbean_xpath</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xerces</groupId>
-           <artifactId>xercesImpl</artifactId>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>xml-apis</groupId>
-           <artifactId>xml-apis</artifactId>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>ant</groupId>
-           <artifactId>ant</artifactId>
+          <groupId>ant</groupId>
+          <artifactId>ant</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-collections</groupId>
-           <artifactId>commons-collections</artifactId>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-primitives</groupId>
-           <artifactId>commons-primitives</artifactId>
+          <groupId>commons-primitives</groupId>
+          <artifactId>commons-primitives</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>commons-pool</groupId>
-           <artifactId>commons-pool</artifactId>
+          <groupId>commons-pool</groupId>
+          <artifactId>commons-pool</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -328,8 +329,8 @@
       <artifactId>spring-core</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -388,32 +389,31 @@
     </plugins>
   </build>
 
-    <profiles>
-        <profile>
-            <id>deploy</id>
-            <build>
-            <defaultGoal>deploy</defaultGoal>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.1.2</version>
-                    <configuration>
-                        <attach>false</attach>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>attach-sources</id>
-                            <goals>
-                                <goal>jar</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-          </build>
-        </profile>
-    </profiles>
+  <profiles>
+    <profile>
+      <id>deploy</id>
+      <build>
+        <defaultGoal>deploy</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.2</version>
+            <configuration>
+              <attach>false</attach>
+            </configuration>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>
-

Modified: activemq/trunk/activemq-run/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-run/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-run/pom.xml (original)
+++ activemq/trunk/activemq-run/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-    	<artifactId>log4j</artifactId>
-    	<scope>test</scope>
-    </dependency>
-    <dependency>
-         <groupId>org.jencks</groupId>
-         <artifactId>jencks</artifactId>
-         <version>2.2</version>
-         <scope>test</scope>
-    </dependency>
-    <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-         <scope>test</scope>
-    </dependency>
-    <dependency>
-         <groupId>${project.groupId}</groupId>
-         <artifactId>activemq-ra</artifactId>
-         <scope>test</scope>
-    </dependency>
-    <dependency>
-         <groupId>org.osgi</groupId>
-         <artifactId>org.osgi.core</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework.osgi</groupId>
-        <artifactId>spring-osgi-core</artifactId>
-        <scope>provided</scope>
-        <optional>true</optional>
-        <exclusions>
-            <exclusion>
-                <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.context</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.beans</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.aop</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.core</artifactId>
-            </exclusion>
-        </exclusions>
-    </dependency>    
-    
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jencks</groupId>
+      <artifactId>jencks</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-ra</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>spring-osgi-core</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>org.springframework.context</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>org.springframework.beans</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>org.springframework.aop</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>org.springframework.core</artifactId>
+        </exclusion>
+      </exclusions>
+    </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>

Modified: activemq/trunk/activemq-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-stomp/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-stomp/pom.xml (original)
+++ activemq/trunk/activemq-stomp/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml (original)
+++ activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml (original)
+++ activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml (original)
+++ activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-        <groupId>org.apache.activemq.tooling</groupId>
-        <artifactId>activemq-tooling</artifactId>
-        <version>5.8-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.apache.activemq.tooling</groupId>
+    <artifactId>activemq-tooling</artifactId>
+    <version>5.8-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>activemq-perf-maven-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>ActiveMQ :: Performance Test Plugin</name>
+  <artifactId>activemq-perf-maven-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>ActiveMQ :: Performance Test Plugin</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-console</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activeio-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-version}</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-broker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-console</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activeio-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbynet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j-version}</version>
+    </dependency>
+  </dependencies>
 </project>

Modified: activemq/trunk/activemq-tooling/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/pom.xml (original)
+++ activemq/trunk/activemq-tooling/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-        <jetty.port>8080</jetty.port>
-    </properties>
+  <properties>
+    <jetty.port>8080</jetty.port>
+  </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.helpers,
-                javax.xml.parsers,
-                javax.xml.transform,
-                javax.management.remote,
-                javax.naming,
-                org.w3c.dom,
-                javax.servlet,
-                javax.servlet.http,
-                javax.servlet.resources,
-                javax.servlet.jsp,
-                javax.servlet.jsp.tagext,
-                javax.servlet.jsp.el,
-                javax.management,
-                javax.management.openmbean,
-                javax.net,
-                org.apache.commons.logging;version="[1.1,2)";resolution:=optional,
-                org.slf4j;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.spi;version="[1.2.14,2)";resolution:=optional,
-                org.eclipse.jetty.continuation;resolution:=optional
+              org.xml.sax,
+              org.xml.sax.helpers,
+              javax.xml.parsers,
+              javax.xml.transform,
+              javax.management.remote,
+              javax.naming,
+              org.w3c.dom,
+              javax.servlet,
+              javax.servlet.http,
+              javax.servlet.resources,
+              javax.servlet.jsp,
+              javax.servlet.jsp.tagext,
+              javax.servlet.jsp.el,
+              javax.management,
+              javax.management.openmbean,
+              javax.net,
+              org.apache.commons.logging;version="[1.1,2)";resolution:=optional,
+              org.slf4j;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.spi;version="[1.2.14,2)";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>
-       <artifactId>activemq-client</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <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>

Modified: activemq/trunk/activemq-web-demo/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/pom.xml (original)
+++ activemq/trunk/activemq-web-demo/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/activemq-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-web/pom.xml (original)
+++ activemq/trunk/activemq-web/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-          <scope>test</scope>
-      </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: activemq/trunk/activemq-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/pom.xml (original)
+++ activemq/trunk/activemq-xmpp/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Mon Jan 28 22:44:25 2013
@@ -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>



Mime
View raw message