Skip to content
Permalink
Browse files
Revert backport of JENKINS-18776 (sometimes incorrectly refered to as…
… JENKINS-18771)

This reverts commit f43b3cd.
This reverts commit 72cea1a.
This reverts commit 01445f4.
This reverts commit ce08bdf.
This reverts commit 448e580.
This reverts commit 381ab03.
  • Loading branch information
olivergondza committed Aug 13, 2013
1 parent cc0a5d5 commit c9eb236d7a09c3a638e2ee4f84879da76c75abab
@@ -55,28 +55,6 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=bug>
Provided maven settings.xml in maven builder is lost.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-15976">issue 15976</a>)
<li class=bug>
Fixed a regression that broke some plugins' form validation
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-18776">issue 18776</a>)
</ul>
</div><!--=TRUNK-END=-->

<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div id="rc" style="display:none;"><!--=BEGIN=-->
<h3><a name=v1.524>What's new in 1.524</a> <!--=DATE=--></h3>
<ul class=image>
<li class=bug>
Clock Difference broken on Manage Nodes page
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-18671">issue 18671</a>)
<li class=bug>
Fixed another possible cause of an NPE from MatrixConfiguration.newBuild.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-17728">issue 17728</a>)
<li class=bug>
NPE in MavenFingerprinter.getArtifactRepositoryMaven21.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-18441">issue 18441</a>)
<li class=rfe>
Can't build using maven 3.1.0
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-15935">issue 15935</a>)
@@ -42,7 +42,7 @@ THE SOFTWARE.

<properties>
<staplerFork>true</staplerFork>
<stapler.version>1.214</stapler.version>
<stapler.version>1.207</stapler.version>
<spring.version>2.5.6.SEC03</spring.version>
</properties>

@@ -776,14 +776,24 @@ THE SOFTWARE.
</configuration>
</plugin>
<plugin><!-- run unit test in src/test/java -->
<groupId>org.codehaus.gmaven</groupId>
<groupId>org.kohsuke.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>
@@ -893,7 +903,7 @@ THE SOFTWARE.
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<groupId>org.kohsuke.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<!-- version specified in grandparent pom -->
<executions>
10 pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci</groupId>
<artifactId>jenkins</artifactId>
<version>1.32</version>
<version>1.30</version>
</parent>

<groupId>org.jenkins-ci.main</groupId>
@@ -278,9 +278,9 @@ THE SOFTWARE.
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<groupId>org.kohsuke.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.5-jenkins-1</version>
<version>1.0-rc-5-patch-2</version>
<dependencies>
<dependency><!-- this needs to be visible to Ant inside GMaven, so has to be a plugin dependency -->
<groupId>org.apache.ant</groupId>
@@ -504,9 +504,9 @@ THE SOFTWARE.
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.gmaven</groupId>
<groupId>org.kohsuke.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<versionRange>1.5-jenkins-1</versionRange>
<versionRange>[1.0-rc-5-patch-2,)</versionRange>
<goals>
<goal>execute</goal>
<goal>testCompile</goal>
@@ -188,18 +188,10 @@ THE SOFTWARE.
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<groupId>org.kohsuke.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<!-- version specified in grandparent pom -->
<executions>
<execution>
<id>default</id>
<!-- compile and process annotations in Groovy test code -->
<goals>
<goal>generateTestStubs</goal>
<goal>testCompile</goal>
</goals>
</execution>
<execution>
<id>preset-packager</id>
<phase>process-resources</phase>
@@ -210,6 +202,13 @@ THE SOFTWARE.
<source>${pom.basedir}/src/main/preset-data/package.groovy</source>
</configuration>
</execution>
<execution>
<id>test-in-groovy</id>
<!-- allow tests written in Groovy -->
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
@@ -223,16 +222,7 @@ THE SOFTWARE.
<artifactId>ant-launcher</artifactId>
<version>1.8.0</version>
</dependency>

<dependency>
<groupId>org.codehaus.gmaven.runtime</groupId>
<artifactId>gmaven-runtime-2.0</artifactId>
<version>1.5-jenkins-1</version>
</dependency>
</dependencies>
<configuration>
<providerSelection>2.0</providerSelection>
</configuration>
</plugin>
</plugins>
</build>
@@ -252,7 +242,7 @@ THE SOFTWARE.
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<groupId>org.kohsuke.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<!-- version specified in grandparent pom -->
<executions>

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit c9eb236

Please sign in to comment.