[JENKINS-18776] Replacing org.kohsuke.gmaven by org.codehaus.gmaven

(cherry picked from commit bf80986) Conflicts: core/pom.xml
jenkinsci · Sep 19, 2013 · 998dc0d · 998dc0d
1 parent 3559a52
commit 998dc0d
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 18 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -776,24 +776,14 @@ 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>
           <execution>
             <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>
@@ -903,7 +893,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/...ava/hudson/util/SecretRewriterTest.groovy → ...ovy/hudson/util/SecretRewriterTest.groovy b/...ava/hudson/util/SecretRewriterTest.groovy → ...ovy/hudson/util/SecretRewriterTest.groovy
diff --git a/...c/test/java/hudson/util/SecretTest.groovy → ...test/groovy/hudson/util/SecretTest.groovy b/...c/test/java/hudson/util/SecretTest.groovy → ...test/groovy/hudson/util/SecretTest.groovy
diff --git a/...security/CryptoConfidentialKeyTest.groovy → ...security/CryptoConfidentialKeyTest.groovy b/...security/CryptoConfidentialKeyTest.groovy → ...security/CryptoConfidentialKeyTest.groovy
diff --git a/...urity/DefaultConfidentialStoreTest.groovy → ...urity/DefaultConfidentialStoreTest.groovy b/...urity/DefaultConfidentialStoreTest.groovy → ...urity/DefaultConfidentialStoreTest.groovy
diff --git a/...s/security/HMACConfidentialKeyTest.groovy → ...s/security/HMACConfidentialKeyTest.groovy b/...s/security/HMACConfidentialKeyTest.groovy → ...s/security/HMACConfidentialKeyTest.groovy
diff --git a/...urity/HexStringConfidentialKeyTest.groovy → ...urity/HexStringConfidentialKeyTest.groovy b/...urity/HexStringConfidentialKeyTest.groovy → ...urity/HexStringConfidentialKeyTest.groovy
diff --git 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>
@@ -275,9 +275,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>
@@ -501,9 +501,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
@@ -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>