diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml
index 05e0d06..c90564a 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/openjpa-integration/daytrader/pom.xml
@@ -36,6 +36,7 @@
     <description>OpenJPA Integration Tests - Daytrader</description>
 
     <properties>
+        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
         <daytrader.version>2.2-SNAPSHOT</daytrader.version>
         <dbcp.maxActive>10</dbcp.maxActive>
         <dbcp.maxIdle>5</dbcp.maxIdle>
diff --git a/openjpa-integration/examples/pom.xml b/openjpa-integration/examples/pom.xml
index b83e83b..4c91658 100644
--- a/openjpa-integration/examples/pom.xml
+++ b/openjpa-integration/examples/pom.xml
@@ -46,6 +46,9 @@
     <name>OpenJPA Integration Tests - Examples</name>
     <description>OpenJPA Integration Tests - Examples</description>
 
+    <properties>
+        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+    </properties>
     <profiles>
     <profile>
     <id>examples-profile</id>
diff --git a/openjpa-integration/slf4j/pom.xml b/openjpa-integration/slf4j/pom.xml
index ff77320..0d1207f 100644
--- a/openjpa-integration/slf4j/pom.xml
+++ b/openjpa-integration/slf4j/pom.xml
@@ -36,6 +36,7 @@
     <description>OpenJPA Integration Tests - SLF4JLogFactory</description>
 
     <properties>
+        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
         <!-- use SLF4JLogFactory for logging -->
         <openjpa.Log>slf4j</openjpa.Log>
     </properties>
diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml
index 19a0f32..841d1e0 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -85,6 +85,7 @@
     <description>OpenJPA Integration Tests - JPA TCK</description>
 
     <properties>
+        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
         <tck2.level>20110815</tck2.level>
     </properties>
 
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index 62e1243..31a58ed 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -36,6 +36,10 @@
     <name>OpenJPA Integration Tests - Bean Validation</name>
     <description>OpenJPA Integration Tests - Bean Validation</description>
 
+    <properties>
+        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+    </properties>
+    
     <profiles>
         <!-- Default profile for testing with Apache BVAL provider -->
         <!-- See http://incubator.apache.org/projects/beanvalidation.html -->
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index d2f2e2b..f015539 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -85,7 +85,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.6</version>
                 <executions>
                     <execution>
                         <id>jjtree-javacc-jpql</id>
diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/event/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/event/localizer.properties
index d3403b8..29f12a7 100644
--- a/openjpa-kernel/src/main/resources/org/apache/openjpa/event/localizer.properties
+++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/event/localizer.properties
@@ -98,4 +98,4 @@
 broker-factory-listener-exception: Exception thrown while calling a \
     BrokerFactoryListener. This exception will be ignored.
 unknown-lifecycle-event: An unknown lifecycle event was encountered. Please \
-    report this to dev@openjpa.apache.org. Event type: {0}.
\ No newline at end of file
+    report this to dev@openjpa.apache.org. Event type: {0}.
diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/instrumentation/jmx/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/instrumentation/jmx/localizer.properties
index 95cc686..8692680 100644
--- a/openjpa-kernel/src/main/resources/org/apache/openjpa/instrumentation/jmx/localizer.properties
+++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/instrumentation/jmx/localizer.properties
@@ -26,4 +26,4 @@
 cannot-stop-instrument: Unable to stop JMX instrument.  Instrument may not have been \
 	started or may not be responding.  See nested exception for details.
 prep-query-cache-not-found: A data cache instance could not be located by the instrumentation. \
-	 Ensure the prepared query cache (QuerySQLCache) is properly configured and available.
\ No newline at end of file
+	 Ensure the prepared query cache (QuerySQLCache) is properly configured and available.
diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml
index 88ca88a..941518e 100644
--- a/openjpa-lib/pom.xml
+++ b/openjpa-lib/pom.xml
@@ -120,7 +120,7 @@
                                 # Load the property file
                                 <property prefix="pcenhancer" file="pcenhancer.revision.file" />
                                 <delete file="pcenhancer.revision.file" />
-								
+
                                 <property name="subversion.revision" value="unknown" />
                                 <property name="pcenhancer.LastChangedRev" value="-1" />
                                 <echo>Revision: ${subversion.revision}</echo>
diff --git a/pom.xml b/pom.xml
index a7018e3..427f322 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,8 +89,8 @@
         <compile.testclass.source>${java.testclass.version}</compile.testclass.source>
         <compile.testclass.target>${java.testclass.version}</compile.testclass.target>
 
-        <maven.javadoc.version>2.9.1</maven.javadoc.version>
-        <maven.surefire.version>2.17</maven.surefire.version>
+        <maven.javadoc.version>2.10.3</maven.javadoc.version>
+        <maven.surefire.version>2.19.1</maven.surefire.version>
     </properties>
 
     <licenses>
@@ -250,6 +250,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
                     </plugin>
                 </plugins>
             </build>
@@ -666,7 +667,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3.2</version>
+                    <version>3.5.1</version>
                     <configuration>
                         <source>${compile.class.source}</source>
                         <target>${compile.class.target}</target>
@@ -675,6 +676,16 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${maven.javadoc.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven.surefire.version}</version>
                     <configuration>
@@ -748,12 +759,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>2.3.1</version>
+                    <version>2.5.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>buildnumber-maven-plugin</artifactId>
-                    <version>1.0-beta-4</version>
+                    <version>1.4</version>
                     <configuration>
                         <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
                         <revisionOnScmFailure>offline</revisionOnScmFailure>
@@ -772,17 +783,17 @@
                 <plugin>
                     <groupId>org.apache.rat</groupId>
                     <artifactId>apache-rat-plugin</artifactId>
-                    <version>0.7</version>
+                    <version>0.11</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.10</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.4.2</version>
+                    <version>2.5.3</version>
                     <configuration>
                         <useReleaseProfile>false</useReleaseProfile>
 
@@ -847,12 +858,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>1.4</version>
+                    <version>2.4.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>2.9</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.codehaus.plexus</groupId>
@@ -864,7 +875,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.3.1</version>
+                    <version>2.6</version>
                     <executions>
                         <execution>
                             <id>default-jar</id>
@@ -894,7 +905,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.1</version>
+                    <version>2.2.0</version>
                     <extensions>true</extensions>
                     <configuration>
                         <instructions>
@@ -915,7 +926,7 @@
                 <plugin>
                     <groupId>com.agilejava.docbkx</groupId>
                     <artifactId>docbkx-maven-plugin</artifactId>
-                    <version>2.0.16</version>
+                    <version>2.0.17</version>
                 </plugin>
                 
                 <!-- Ignore/Execute plugin execution -->
@@ -1177,7 +1188,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>