diff --git a/core/pom.xml b/core/pom.xml
index 2ccfd9e..ccb1ef1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -39,7 +39,6 @@
   </parent>
   <artifactId>piccolo2d-core</artifactId>
   <packaging>bundle</packaging>
-<!--  <packaging>jar</packaging> -->
   <name>Piccolo2D Core</name>
   <scm>
     <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/core</connection>
@@ -50,7 +49,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.9.1</version>
         <configuration>
           <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>          
@@ -58,9 +57,9 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>        
-        <version>2.8</version>
+        <version>2.9</version>
         <configuration>
-          <source>${jdk.version}</source>
+          <quiet>true</quiet>
           <verbose>false</verbose>
           <show>package</show>
         </configuration>
@@ -73,20 +72,16 @@
         </reportSets>
       </plugin>
       <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.7.1</version>
-      </plugin>
-      <plugin>
         <artifactId>maven-changelog-plugin</artifactId>
         <version>2.2</version>
-        <!--
-          configuration> <connectionType>connection</connectionType>
-          </configuration
-        -->
       </plugin>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>        
-        <version>2.2</version>
+        <version>2.3</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.14</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -103,13 +98,12 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.3.1</version>
+        <version>2.4</version>
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.5</version>
+        <version>3.0.1</version>
         <configuration>
-          <sourceEncoding>ascii</sourceEncoding>
           <targetJdk>${jdk.version}</targetJdk>
         </configuration>
       </plugin>
@@ -121,25 +115,16 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
+        <version>2.5.2</version>
         <configuration>
-          <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin -->
-          <findbugsXmlOutput>true</findbugsXmlOutput>
-          <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-          <xmlOutput>true</xmlOutput>
-          <xmlOutputDirectory>target/site</xmlOutputDirectory>
           <includeTests>false</includeTests>         
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5.2</version>
         <configuration>
-          <formats>
-            <format>xml</format>
-            <format>html</format>
-          </formats>
           <instrumentation>
             <ignores>
               <ignore>org.piccolo2d.examples.*</ignore>
diff --git a/examples/pom.xml b/examples/pom.xml
index abfa70d..d9df84a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -40,7 +40,6 @@
   <artifactId>piccolo2d-examples</artifactId>
   <name>Piccolo2D Examples</name>
   <packaging>bundle</packaging>
-<!--  <packaging>jar</packaging> -->
   <dependencies>
     <dependency>
       <groupId>org.piccolo2d</groupId>
@@ -56,7 +55,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <archive>
@@ -71,4 +69,12 @@
       </plugin>
     </plugins>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.4</version>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>
diff --git a/extras/pom.xml b/extras/pom.xml
index 137cfcc..60cb272 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -39,7 +39,6 @@
   </parent>
   <artifactId>piccolo2d-extras</artifactId>
   <packaging>bundle</packaging>
-<!--  <packaging>jar</packaging> -->
   <name>Piccolo2D Extras</name>
   <dependencies>
     <dependency>
@@ -47,12 +46,6 @@
       <artifactId>piccolo2d-core</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.easytesting</groupId>
-      <artifactId>fest-swing-junit</artifactId>
-      <version>1.2a4</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <scm>
     <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/extras</connection>
@@ -63,17 +56,17 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.9.1</version>
         <configuration>
           <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
-          <enableRulesSummary>false</enableRulesSummary>
+          <enableRulesSummary>false</enableRulesSummary>          
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>        
-        <version>2.8</version>
+        <version>2.9</version>
         <configuration>
-          <source>${jdk.version}</source>
+          <quiet>true</quiet>
           <verbose>false</verbose>
           <show>package</show>
         </configuration>
@@ -86,20 +79,16 @@
         </reportSets>
       </plugin>
       <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.7.1</version>
-      </plugin>
-      <plugin>
         <artifactId>maven-changelog-plugin</artifactId>
         <version>2.2</version>
-        <!--
-          configuration> <connectionType>connection</connectionType>
-          </configuration
-        -->
       </plugin>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>        
-        <version>2.2</version>
+        <version>2.3</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.14</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -116,13 +105,12 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.3.1</version>
+        <version>2.4</version>
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.5</version>
+        <version>3.0.1</version>
         <configuration>
-          <sourceEncoding>ascii</sourceEncoding>
           <targetJdk>${jdk.version}</targetJdk>
         </configuration>
       </plugin>
@@ -134,34 +122,29 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
+        <version>2.5.2</version>
         <configuration>
-          <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin -->
-          <findbugsXmlOutput>true</findbugsXmlOutput>
-          <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-          <xmlOutput>true</xmlOutput>
-          <xmlOutputDirectory>target/site</xmlOutputDirectory>
           <includeTests>false</includeTests>         
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5.2</version>
         <configuration>
-          <formats>
-            <format>xml</format>
-            <format>html</format>
-          </formats>
           <instrumentation>
             <ignores>
               <ignore>org.piccolo2d.examples.*</ignore>
               <ignore>org.piccolo2d.examples.pswing.*</ignore>
               <ignore>org.piccolo2d.examples.swt.*</ignore>
-              <ignore>org.piccolo2d.tutorial.*</ignore>
+              <ignore>org.piccolo2d.tutorial.*</ignore>              
             </ignores>
             <excludes>
-              <exclude>org/piccolo2d/examples/**</exclude>
+              <exclude>org/piccolo2d/examples/**</exclude>              
+              <exclude>org/piccolo2d/**/*Test.class</exclude>
+              <exclude>org/piccolo2d/extras/**/*Test.class</exclude>
+              <exclude>org/piccolo2d/**/Mock*.class</exclude>
+              <exclude>org/piccolo2d/extras/**/Mock*.class</exclude>
             </excludes>
           </instrumentation>
         </configuration>
diff --git a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingFESTTest.java b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingFESTTest.java
deleted file mode 100644
index 85b05e2..0000000
--- a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingFESTTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2008-2011, Piccolo2D project, http://piccolo2d.org
- * Copyright (c) 1998-2008, University of Maryland
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of conditions
- * and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions
- * and the following disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * None of the name of the University of Maryland, the name of the Piccolo2D project, or the names of its
- * contributors may be used to endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.piccolo2d.extras.pswing;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Point;
-
-import javax.swing.JFrame;
-import javax.swing.JList;
-
-import junit.framework.TestCase;
-
-import org.fest.swing.core.MouseButton;
-import org.fest.swing.core.MouseClickInfo;
-import org.fest.swing.exception.ComponentLookupException;
-import org.fest.swing.fixture.FrameFixture;
-import org.fest.swing.fixture.JListFixture;
-import org.piccolo2d.extras.pswing.PSwing;
-import org.piccolo2d.extras.pswing.PSwingCanvas;
-
-/**
- * The <b>PSwingFESTTest</b> is a TestCase designed to ensure Piccolo2D plays
- * well with the FEST GUI Testing Framework.
- */
-public class PSwingFESTTest extends TestCase {
-    private FrameFixture frameFixture;
-
-    public void setUp() {
-        JFrame frame = new JFrame();
-        PSwingCanvas swingCanvas = new PSwingCanvas();
-        swingCanvas.setName("canvas");
-        swingCanvas.setPreferredSize(new Dimension(300, 300));
-
-        JList testList = new JList(new String[] { "One", "Two", "Three" });
-        testList.setName("testList");
-        swingCanvas.getLayer().addChild(new PSwing(testList));
-
-        frame.getContentPane().add(swingCanvas);
-        frame.pack();
-
-        frameFixture = new FrameFixture(frame);
-        frameFixture.show();
-    }
-
-    public void tearDown() {
-        frameFixture.cleanUp();
-    }
-
-    public void testFESTThrowsExceptionWhenComponentNotFound() {
-        try {
-            frameFixture.list("invalidListName");
-        }
-        catch (ComponentLookupException expected) {
-            // Expected
-        }
-    }
-
-    public void testUnderlyingSwingComponentsAreAccessibleToFEST() {
-        JListFixture listFixture = frameFixture.list("testList");
-        listFixture.selectItem("One");
-        listFixture.requireVisible();
-        
-        assertFirstElementOfListSelected();
-    }
-
-    //TODO: Make this work while running in headlesss mode under Xvnc
-    /* public void testClickingOnPSwingPassesThroughToComponent() {
-        Component canvas = frameFixture.robot.finder().findByName("canvas");
-        assertNotNull(canvas);
-
-        Point point = canvas.getLocationOnScreen();
-        Point firstElementPoint = new Point(point.x + 5, point.y + 5);
-        frameFixture.robot.click(firstElementPoint, MouseButton.LEFT_BUTTON, 1);
-
-        assertFirstElementOfListSelected();
-    }*/
-
-    private void assertFirstElementOfListSelected() {
-        JListFixture listFixture = frameFixture.list("testList");
-
-        String[] selection = listFixture.selection();
-        assertNotNull(selection);
-        assertFalse(0 == selection.length);
-        assertEquals("One", selection[0]);
-    }
-}
diff --git a/parent/pom.xml b/parent/pom.xml
index 4f86d52..160fcca 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -31,45 +31,28 @@
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
+  </parent>
   <groupId>org.piccolo2d</groupId>
   <artifactId>piccolo2d-parent</artifactId>
   <version>3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Piccolo2D Parent</name>
   <description>A revolutionary way to create robust, full-featured graphical applications in Java and C#, with striking visual effects such as zooming, animation and multiple representations.</description>
+  <url>http://www.piccolo2d.org</url>
   <properties>
     <jdk.version>1.6</jdk.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.targetEncoding>UTF-8</project.build.targetEncoding>
-    <httpbase>http://www.piccolo2d.org/java</httpbase>
-    <httpsitebase>${httpbase}/site</httpsitebase>
-    <!--
-      ftpbase>ftp://jcurl.org</ftpbase>
-      <ftpsitebase>${ftpbase}/site</ftpsitebase
-    -->
-    <scpbase>
-      <!--
-        @TODO Will, is there ssh access to the website? Required for
-        artifact upload.
-      -->
-    </scpbase>
-    <scpsitebase>
-      <!--
-        @TODO Will, is there ssh access to the website? Required for maven
-        site upload.
-      -->
-    </scpsitebase>
   </properties>
-  <url>${httpsitebase}/${project.artifactId}/${project.version}</url>
   <issueManagement>
     <system>Google Code</system>
     <url>http://code.google.com/p/piccolo2d/issues/list</url>
   </issueManagement>
   <inceptionYear>1995</inceptionYear>
-  <ciManagement>
-    <system>hudson</system>
-    <url>http://allain.homelinux.org:2121/</url>
-  </ciManagement>
   <mailingLists>
     <mailingList>
       <name>Piccolo2D Announce</name>
@@ -231,52 +214,56 @@
       <plugins>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-4</version>
+          <version>2.4</version>
         </plugin>
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4.1</version>
+          <version>2.5</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <version>3.1</version>
           <configuration>
-            <verbose>true</verbose>
-            <fork>true</fork>
-            <encoding>ascii</encoding>
-            <optimize>false</optimize>
-            <debug>false</debug>
-            <compilerVersion>${jdk.version}</compilerVersion>
-            <showDeprecation>false</showDeprecation>
-            <showWarnings>true</showWarnings>
             <source>${jdk.version}</source>
             <target>${jdk.version}</target>
           </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.1.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.5</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-gpg-plugin</artifactId>
           <version>1.2</version>
         </plugin>
         <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.4</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>        
-          <version>2.8</version>
+          <version>2.9</version>
           <configuration>
-            <source>${jdk.version}</source>
+            <quiet>true</quiet>
             <verbose>false</verbose>
             <show>package</show>
           </configuration>
         </plugin>
         <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3.1</version>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.4.1</version>
+          <configuration>
+            <releaseProfiles>release</releaseProfiles>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-scm-plugin</artifactId>
@@ -286,12 +273,20 @@
           </configuration>
         </plugin>
         <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.6</version>
+        </plugin>
+        <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.1</version>
+          <version>3.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.2.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.8</version>
+          <version>2.14</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
@@ -318,10 +313,10 @@
             <configuration>
               <rules>
                 <requireMavenVersion>
-                  <version>[3.0.4,)</version>
+                  <version>[3.0.5,)</version>
                 </requireMavenVersion>
                 <requireJavaVersion>
-                  <version>1.6</version>
+                  <version>[1.6,)</version>
                 </requireJavaVersion>
               </rules>    
             </configuration>
@@ -345,50 +340,5 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-  </dependencies>  
-  <distributionManagement>
-    <!--
-      use a ~/.m2/settings.xml like this: <settings> <profiles> <profile>
-      <id>piccolo2d</id> <activation>
-      <activeByDefault>true</activeByDefault> </activation> <properties>
-      <piccolo2d.file.site.base>file:///var/www/piccolo2d/</piccolo2d.file.site.base>
-      </properties> </profile> </profiles> </settings>
-    -->
-    <site>
-      <id>maven.site</id>
-      <url>${piccolo2d.file.site.base}</url>
-    </site>
-    <repository>
-      <id>sonatype-nexus-staging</id>
-      <name>Nexus Release Repository</name>
-      <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-  <profiles>
-    <profile>
-      <id>release-sign-artifacts</id>
-      <activation>
-        <property>
-          <name>signArtifacts</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 43a6b14..5a8efa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,14 @@
     <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk</developerConnection>
     <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk</url>
   </scm>
-  <build />
-  <reporting />
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.4</version>
+      </plugin>
+    </plugins>
+  </reporting>
   <modules>
     <module>parent</module>
     <module>core</module>
diff --git a/swt-examples/pom.xml b/swt-examples/pom.xml
index b923585..38a4453 100644
--- a/swt-examples/pom.xml
+++ b/swt-examples/pom.xml
@@ -39,7 +39,6 @@
   </parent>
   <artifactId>piccolo2d-swt-examples</artifactId>
   <packaging>bundle</packaging>
-<!--  <packaging>jar</packaging> -->
   <name>Piccolo2D SWT Examples</name>
   <scm>
     <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt-examples</connection>
@@ -56,7 +55,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <archive>
@@ -71,4 +69,12 @@
       </plugin>
     </plugins>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.4</version>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>
diff --git a/swt/pom.xml b/swt/pom.xml
index 41b0c5b..d5c3365 100644
--- a/swt/pom.xml
+++ b/swt/pom.xml
@@ -39,7 +39,6 @@
   </parent>
   <artifactId>piccolo2d-swt</artifactId>
   <packaging>bundle</packaging>
-<!--  <packaging>jar</packaging> -->
   <name>Piccolo2D SWT</name>
   <dependencies>
     <dependency>
@@ -73,17 +72,17 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.9.1</version>
         <configuration>
           <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
-          <enableRulesSummary>false</enableRulesSummary>
+          <enableRulesSummary>false</enableRulesSummary>          
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>        
-        <version>2.8</version>
+        <version>2.9</version>
         <configuration>
-          <source>${jdk.version}</source>
+          <quiet>true</quiet>
           <verbose>false</verbose>
           <show>package</show>
         </configuration>
@@ -96,20 +95,16 @@
         </reportSets>
       </plugin>
       <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.7.1</version>
-      </plugin>
-      <plugin>
         <artifactId>maven-changelog-plugin</artifactId>
         <version>2.2</version>
-        <!--
-          configuration> <connectionType>connection</connectionType>
-          </configuration
-        -->
       </plugin>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>        
-        <version>2.2</version>
+        <version>2.3</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.14</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -126,13 +121,12 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.3.1</version>
+        <version>2.4</version>
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.5</version>
+        <version>3.0.1</version>
         <configuration>
-          <sourceEncoding>ascii</sourceEncoding>
           <targetJdk>${jdk.version}</targetJdk>
         </configuration>
       </plugin>
@@ -144,39 +138,34 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
+        <version>2.5.2</version>
         <configuration>
-          <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin -->
-          <findbugsXmlOutput>true</findbugsXmlOutput>
-          <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-          <xmlOutput>true</xmlOutput>
-          <xmlOutputDirectory>target/site</xmlOutputDirectory>
-          <includeTests>false</includeTests>        
+          <includeTests>false</includeTests>         
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5.2</version>
         <configuration>
-          <formats>
-            <format>xml</format>
-            <format>html</format>
-          </formats>
           <instrumentation>
             <ignores>
               <ignore>org.piccolo2d.examples.*</ignore>
               <ignore>org.piccolo2d.examples.pswing.*</ignore>
               <ignore>org.piccolo2d.examples.swt.*</ignore>
-              <ignore>org.piccolo2d.tutorial.*</ignore>
+              <ignore>org.piccolo2d.tutorial.*</ignore>              
             </ignores>
             <excludes>
-              <exclude>org/piccolo2d/examples/**</exclude>
+              <exclude>org/piccolo2d/examples/**</exclude>              
+              <exclude>org/piccolo2d/**/*Test.class</exclude>
+              <exclude>org/piccolo2d/extras/**/*Test.class</exclude>
+              <exclude>org/piccolo2d/**/Mock*.class</exclude>
+              <exclude>org/piccolo2d/extras/**/Mock*.class</exclude>
             </excludes>
           </instrumentation>
         </configuration>
       </plugin>
-    </plugins>  
+    </plugins>
   </reporting>
   <profiles>
     <profile>