diff --git a/core/pom.xml b/core/pom.xml
index cd2dd74e57..3ec8d5caac 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -42,7 +42,7 @@ THE SOFTWARE.
 
   <properties>
     <staplerFork>true</staplerFork>
-    <stapler.version>1.214</stapler.version>
+    <stapler.version>1.215</stapler.version>
     <spring.version>2.5.6.SEC03</spring.version>
   </properties>
 
@@ -768,7 +768,7 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin><!-- run unit test in src/test/java -->
-        <groupId>org.kohsuke.gmaven</groupId>
+        <groupId>org.codehaus.gmaven</groupId>
         <artifactId>gmaven-plugin</artifactId>
         <!-- version specified in grandparent pom -->
         <executions>
@@ -776,16 +776,6 @@ THE SOFTWARE.
             <goals>
               <goal>testCompile</goal>
             </goals>
-            <configuration>
-              <sources>
-                <fileset>
-                  <directory>${project.basedir}/src/test/java</directory>
-                  <includes>
-                    <include>**/*.groovy</include>
-                  </includes>
-                </fileset>
-              </sources>
-            </configuration>
           </execution>
         </executions>
         <dependencies>
@@ -895,7 +885,7 @@ THE SOFTWARE.
       <build>
         <plugins>
           <plugin>
-            <groupId>org.kohsuke.gmaven</groupId>
+            <groupId>org.codehaus.gmaven</groupId>
             <artifactId>gmaven-plugin</artifactId>
             <!-- version specified in grandparent pom -->
             <executions>
diff --git a/core/src/test/java/hudson/util/SecretRewriterTest.groovy b/core/src/test/groovy/hudson/util/SecretRewriterTest.groovy
similarity index 100%
rename from core/src/test/java/hudson/util/SecretRewriterTest.groovy
rename to core/src/test/groovy/hudson/util/SecretRewriterTest.groovy
diff --git a/core/src/test/java/hudson/util/SecretTest.groovy b/core/src/test/groovy/hudson/util/SecretTest.groovy
similarity index 100%
rename from core/src/test/java/hudson/util/SecretTest.groovy
rename to core/src/test/groovy/hudson/util/SecretTest.groovy
diff --git a/core/src/test/java/jenkins/security/CryptoConfidentialKeyTest.groovy b/core/src/test/groovy/jenkins/security/CryptoConfidentialKeyTest.groovy
similarity index 100%
rename from core/src/test/java/jenkins/security/CryptoConfidentialKeyTest.groovy
rename to core/src/test/groovy/jenkins/security/CryptoConfidentialKeyTest.groovy
diff --git a/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.groovy b/core/src/test/groovy/jenkins/security/DefaultConfidentialStoreTest.groovy
similarity index 100%
rename from core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.groovy
rename to core/src/test/groovy/jenkins/security/DefaultConfidentialStoreTest.groovy
diff --git a/core/src/test/java/jenkins/security/HMACConfidentialKeyTest.groovy b/core/src/test/groovy/jenkins/security/HMACConfidentialKeyTest.groovy
similarity index 100%
rename from core/src/test/java/jenkins/security/HMACConfidentialKeyTest.groovy
rename to core/src/test/groovy/jenkins/security/HMACConfidentialKeyTest.groovy
diff --git a/core/src/test/java/jenkins/security/HexStringConfidentialKeyTest.groovy b/core/src/test/groovy/jenkins/security/HexStringConfidentialKeyTest.groovy
similarity index 100%
rename from core/src/test/java/jenkins/security/HexStringConfidentialKeyTest.groovy
rename to core/src/test/groovy/jenkins/security/HexStringConfidentialKeyTest.groovy
diff --git a/pom.xml b/pom.xml
index 0e6ae69dd8..6e9119c126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.30</version>
+    <version>1.32</version>
   </parent>
 
   <groupId>org.jenkins-ci.main</groupId>
@@ -285,9 +285,9 @@ THE SOFTWARE.
           </executions>
         </plugin>
         <plugin>
-          <groupId>org.kohsuke.gmaven</groupId>
+          <groupId>org.codehaus.gmaven</groupId>
           <artifactId>gmaven-plugin</artifactId>
-          <version>1.0-rc-5-patch-2</version>
+          <version>1.5-jenkins-1</version>
           <dependencies>
             <dependency><!-- this needs to be visible to Ant inside GMaven, so has to be a plugin dependency -->
               <groupId>org.apache.ant</groupId>
@@ -511,9 +511,9 @@ THE SOFTWARE.
         			<pluginExecutions>
         				<pluginExecution>
         					<pluginExecutionFilter>
-        						<groupId>org.kohsuke.gmaven</groupId>
+        						<groupId>org.codehaus.gmaven</groupId>
         						<artifactId>gmaven-plugin</artifactId>
-        						<versionRange>[1.0-rc-5-patch-2,)</versionRange>
+        						<versionRange>1.5-jenkins-1</versionRange>
         						<goals>
         							<goal>execute</goal>
         							<goal>testCompile</goal>
diff --git a/test/pom.xml b/test/pom.xml
index e85396383d..6bdc15d28b 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -196,7 +196,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.codehaus.gmaven</groupId>
         <artifactId>gmaven-plugin</artifactId>
-        <version>1.5-jenkins-1</version>
+        <!-- version specified in grandparent pom -->
         <executions>
           <execution>
             <id>default</id>
@@ -260,7 +260,7 @@ THE SOFTWARE.
           <plugin>
             <groupId>org.codehaus.gmaven</groupId>
             <artifactId>gmaven-plugin</artifactId>
-            <version>1.5-jenkins-1</version>
+            <!-- version specified in grandparent pom -->
             <executions>
               <!-- run unit test -->
               <execution>