Index: processor/pom.xml
===================================================================
--- processor/pom.xml	(revision 1076109)
+++ processor/pom.xml	(working copy)
@@ -27,29 +27,10 @@
   <groupId>org.apache.james</groupId>
   <artifactId>apache-james-imap-processor</artifactId>
   <name>Apache James IMAP Mailbox Processor function</name>
-  <profiles>
-    <profile>
-      <!-- Geronimo Mail module do not declare runtime dependency on Activation -->
-      <id>geronimo</id>
-      <dependencies>
-        <dependency>
-          <groupId>${javax.activation.groupId}</groupId>
-          <artifactId>${javax.activation.artifactId}</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-mailbox-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>apache-james-imap-message</artifactId>
     </dependency>
     <dependency>
@@ -57,19 +38,6 @@
       <artifactId>apache-mime4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>${javax.mail.groupId}</groupId>
-      <artifactId>${javax.mail.artifactId}</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.jmock</groupId>
       <artifactId>jmock</artifactId>
       <scope>test</scope>
Index: message/pom.xml
===================================================================
--- message/pom.xml	(revision 1076109)
+++ message/pom.xml	(working copy)
@@ -28,19 +28,6 @@
   <artifactId>apache-james-imap-message</artifactId>
   <name>Apache James IMAP Message Library</name>
   
-  <profiles>
-    <profile>
-      <!-- Geronimo Mail module do not declare runtime dependency on Activation -->
-      <id>geronimo</id>
-      <dependencies>
-        <dependency>
-          <groupId>${javax.activation.groupId}</groupId>
-          <artifactId>${javax.activation.artifactId}</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-  
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -57,10 +44,6 @@
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
Index: api/pom.xml
===================================================================
--- api/pom.xml	(revision 1076109)
+++ api/pom.xml	(working copy)
@@ -45,7 +45,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
-      <version>4.4</version>
     </dependency>
 
   </dependencies>
Index: pom.xml
===================================================================
--- pom.xml	(revision 1076109)
+++ pom.xml	(working copy)
@@ -34,6 +34,10 @@
   <inceptionYear>2002</inceptionYear>
   <packaging>pom</packaging>
 
+  <prerequisites>
+    <maven>3.0.2</maven>
+  </prerequisites>
+
   <modules>
     <module>api</module>
     <module>message</module>
@@ -64,8 +68,54 @@
   </repositories>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version></version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.0-beta-3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.3.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>findbugs-maven-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jxr-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <optimize>true</optimize>
@@ -95,6 +145,7 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptorRefs>
@@ -123,6 +174,75 @@
           </instructions>
         </configuration>
       </plugin>
+      
+      <!-- Site generation -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jxr-plugin</artifactId>
+              <configuration>
+                <aggregate>true</aggregate>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <forkMode>pertest</forkMode>
+                <argLine>-Xms256m -Xmx512m</argLine>
+                <testFailureIgnore>false</testFailureIgnore>
+                <skip>false</skip>
+                <includes>
+                  <include>**/*Test.java</include>
+                </includes>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>rat-maven-plugin</artifactId>
+              <version>1.0-alpha-3</version>
+              <configuration>
+                <excludes>
+                  <exclude>NOTICE.*</exclude>
+                  <exclude>LICENSE.*</exclude>
+                  <!-- Generated by Maven -->
+                  <exclude>release.properties</exclude>
+                  <exclude>dist/**/*</exclude>
+                  <!-- Eclipse -->
+                  <exclude>**/.*</exclude>
+                  <exclude>.*/**/*</exclude>
+      
+                </excludes>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-pmd-plugin</artifactId>
+              <configuration>
+                <aggregate>true</aggregate>
+                <targetJdk>${target.jdk}</targetJdk>
+                <rulesets>
+                  <ruleset>/rulesets/basic.xml</ruleset>
+                  <ruleset>/rulesets/unusedcode.xml</ruleset>
+                  <ruleset>/rulesets/imports.xml</ruleset>
+                </rulesets>
+                <format>xml</format>
+                <linkXref>true</linkXref>
+                <sourceEncoding>utf-8</sourceEncoding>
+                <minimumTokens>100</minimumTokens>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>findbugs-maven-plugin</artifactId>
+            </plugin>
+          </reportPlugins>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -134,7 +254,7 @@
       <dependency>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox-api</artifactId>
-        <version>0.2-M2-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.james</groupId>
@@ -321,72 +441,6 @@
     </dependencies>
   </dependencyManagement>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>pertest</forkMode>
-          <argLine>-Xms256m -Xmx512m</argLine>
-          <testFailureIgnore>false</testFailureIgnore>
-          <skip>false</skip>
-          <includes>
-            <include>**/*Test.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <configuration>
-          <excludes>
-            <exclude>NOTICE.*</exclude>
-            <exclude>LICENSE.*</exclude>
-            <!-- Generated by Maven -->
-            <exclude>release.properties</exclude>
-            <exclude>dist/**/*</exclude>
-            <!-- Eclipse -->
-            <exclude>**/.*</exclude>
-            <exclude>.*/**/*</exclude>
-
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-          <targetjdk>${target.jdk}</targetjdk>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/unusedcode.xml</ruleset>
-            <ruleset>/rulesets/imports.xml</ruleset>
-          </rulesets>
-          <format>xml</format>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <minimumTokens>100</minimumTokens>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-    </plugins>
-  </reporting>
-
   <profiles>
     <profile>
       <id>geronimo</id>