diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index ea7aca0470..498ee4255b 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -190,11 +190,13 @@
       <!-- Configure which tests are included/excuded -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.1.2-SNAPSHOT</version>
         <configuration>
           <forkMode>pertest</forkMode>
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
+          <includes>
+            <include>**/*Test.*</include>
+          </includes>
           <excludes>
             <!-- These tests run too slow to execute as part of the unit tests -->
             <exclude>**/DefaultStoreBrokerTest.*</exclude>
@@ -209,6 +211,18 @@
         </configuration>
       </plugin>
 
+      <!-- generate the attached tests jar -->
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 90c41aa76c..443b31e4f8 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -31,39 +31,39 @@
   <dependencies>
   
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-optional</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-ra</artifactId>
       <type>rar</type>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-jaas</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
       <type>war</type>
       <version>${project.version}</version>
@@ -138,33 +138,34 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1-SNAPSHOT</version>
         <executions>
           <execution>
-            <phase>compile</phase>
+            <id>bin</id>
+            <phase>package</phase>
             <goals>
               <goal>assembly</goal>
             </goals>
             <configuration>
-              <descriptor>src/main/descriptors/jar.xml</descriptor>
+              <descriptors>
+                 <descriptor>src/main/descriptors/bin.xml</descriptor>
+              </descriptors>
+              <finalName>activemq-${project.version}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
           <execution>
-            <phase>install</phase>
+            <id>full</id>
+            <phase>package</phase>
             <goals>
               <goal>assembly</goal>
             </goals>
             <configuration>
               <descriptors>
                  <descriptor>src/main/descriptors/all-jar.xml</descriptor>
-                 <descriptor>src/main/descriptors/bin.xml</descriptor>
-             </descriptors>
+              </descriptors>
+              <finalName>activemq-full-${project.version}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
         </executions>
diff --git a/assembly/src/main/descriptors/all-jar.xml b/assembly/src/main/descriptors/all-jar.xml
index 2508fadc97..42c9dd6117 100644
--- a/assembly/src/main/descriptors/all-jar.xml
+++ b/assembly/src/main/descriptors/all-jar.xml
@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 <assembly>
-  <id></id>
+  <id>full</id>
   <formats>
     <format>jar</format>
   </formats>
diff --git a/assembly/src/main/descriptors/bin.xml b/assembly/src/main/descriptors/bin.xml
index 0b6029d110..9bb6b1ffb2 100644
--- a/assembly/src/main/descriptors/bin.xml
+++ b/assembly/src/main/descriptors/bin.xml
@@ -42,6 +42,14 @@
     </fileSet>
   </fileSets>
   <dependencySets>
+    <dependencySet>
+      <outputDirectory>/bin</outputDirectory>
+      <outputFileNameMapping>run.jar</outputFileNameMapping>
+      <unpack>false</unpack>
+      <includes>
+         <include>org.apache.activemq:activemq-console</include>
+      </includes>
+    </dependencySet>
     <dependencySet>
       <outputDirectory>/lib</outputDirectory>
       <unpack>false</unpack>
@@ -49,7 +57,7 @@
       <includes>
          <include>activeio:activeio</include>
          <include>mx4j:mx4j</include>
-         <include>${pom.groupId}:activemq-core</include>
+         <include>org.apache.activemq:activemq-core</include>
          <include>backport-util-concurrent:backport-util-concurrent</include>
          <include>commons-logging:commons-logging</include>
          <include>geronimo-spec:geronimo-spec-jms</include>
@@ -78,10 +86,6 @@
          <include>geronimo-spec:geronimo-spec-j2ee-jacc</include>
          <include>log4j:log4j</include>
          <include>activeio:activeio</include>
-         <include>activeio:activeio</include>
-         <include>activeio:activeio</include>
-         <include>activeio:activeio</include>
-         <include>activeio:activeio</include>
       </includes>
     </dependencySet>
   </dependencySets>
diff --git a/assembly/src/main/descriptors/run-jar.xml b/assembly/src/main/descriptors/run-jar.xml
index 2037ea98a6..bd9c480106 100644
--- a/assembly/src/main/descriptors/run-jar.xml
+++ b/assembly/src/main/descriptors/run-jar.xml
@@ -24,9 +24,8 @@
     <dependencySet>
       <outputDirectory>/</outputDirectory>
       <unpack>true</unpack>
-      <scope>runtime</scope>
       <includes>
-         <include>org.apache.activemq:activemq-core</include>
+         <include>org.apache.activemq:activemq-console</include>
       </includes>
     </dependencySet>
   </dependencySets>
diff --git a/pom.xml b/pom.xml
index 4182b81ffc..25fa98d155 100755
--- a/pom.xml
+++ b/pom.xml
@@ -73,46 +73,6 @@
     </pluginRepository>
   </pluginRepositories>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <outputDirectory>bin</outputDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.1.1</version>
-        <configuration>
-          <!-- <forkMode>pertest</forkMode> -->
-          <forkMode>none</forkMode>
-        </configuration>
-      </plugin>
-      <!-- generate the attached tests jar -->
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <modules>
 
     <module>activemq-core</module>
@@ -139,7 +99,7 @@
     </license>
   </licenses>
 
- <scm>
+  <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/activemq/trunk</connection>
     <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/activemq/trunk</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/incubator/activemq/trunk/</url>
@@ -213,6 +173,7 @@
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-spring</artifactId>
         <version>2.2</version>
+        <optional>true</optional>
       </dependency>
  
       <!-- Used to configure the activemq logs -->
@@ -236,6 +197,7 @@
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
         <version>2.1</version>
+        <optional>true</optional>
       </dependency>
       
       <!-- Optional Spring Support -->
@@ -243,6 +205,7 @@
         <groupId>org.springframework</groupId>
         <artifactId>spring</artifactId>
         <version>1.2.4</version>
+        <optional>true</optional>
       </dependency>
       
       <!-- an optional discovery agent -->
@@ -250,6 +213,7 @@
         <groupId>activecluster</groupId>
         <artifactId>activecluster</artifactId>
         <version>1.1-SNAPSHOT</version>
+        <optional>true</optional>
       </dependency>
     
       <!-- Optional Derby support-->
@@ -257,6 +221,7 @@
         <groupId>org.apache.derby</groupId>
         <artifactId>derby</artifactId>
         <version>10.1.1.0</version>
+        <optional>true</optional>
       </dependency>
       
       <!-- Optional Axion support -->
@@ -264,18 +229,21 @@
         <groupId>axion</groupId>
         <artifactId>axion</artifactId>
         <version>1.0-M3-dev</version>
+        <optional>true</optional>
       </dependency>
 
       <dependency>
         <groupId>commons-primitives</groupId>
         <artifactId>commons-primitives</artifactId>
         <version>1.0</version>
+        <optional>true</optional>
       </dependency>
 
       <dependency>
         <groupId>regexp</groupId>
         <artifactId>regexp</artifactId>
         <version>1.3</version>
+        <optional>true</optional>
       </dependency>
       
       <!-- Optional HSQL DB Support -->
@@ -284,11 +252,13 @@
       <groupId>hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
         <version>1.7.2.2</version>
+        <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>commons-dbcp</groupId>
         <artifactId>commons-dbcp</artifactId>
         <version>1.2</version>
+        <optional>true</optional>
       </dependency>
       -->
 
@@ -296,6 +266,7 @@
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
         <version>1.2</version>
+        <optional>true</optional>
       </dependency>
       
       <!-- Optional Journal Implementation -->
@@ -304,20 +275,23 @@
         <groupId>howl</groupId>
         <artifactId>howl-logger</artifactId>
         <version>0.1.7</version>
+        <optional>true</optional>
       </dependency>
       -->
-    
+
       <!-- Optional Jabber support -->
       <dependency>
         <groupId>activemq</groupId>
         <artifactId>smack</artifactId>
         <version>1.5.0</version>
+        <optional>true</optional>
       </dependency>
 
       <dependency>
         <groupId>activemq</groupId>
         <artifactId>smackx</artifactId>
         <version>1.5.0</version>
+        <optional>true</optional>
       </dependency>
   
       <!-- =============================== -->
@@ -481,7 +455,7 @@
         <artifactId>ant</artifactId>
         <version>1.6.2</version>
       </dependency>
- 
+
     </dependencies>
   </dependencyManagement>
 <!--
@@ -509,19 +483,48 @@
   </dependencies>
 -->
 
-  <distributionManagement>
-    <!--
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Repository</name>
-      <url>scpexe://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url>
-    </repository>
-    -->
-    <snapshotRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Development Repository</name>
-      <url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
-    </snapshotRepository>
-  </distributionManagement>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.1.3-SNAPSHOT</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <outputDirectory>bin</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>pertest</forkMode>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>surefire-report-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
 
 </project>