Skip to content
Permalink
Browse files

[FIXED JENKINS-28120] Merge pull request #1679

  • Loading branch information
kohsuke committed Apr 29, 2015
2 parents ca3b1db + c00935f commit e75bea8928a904c5a2de47f3ee54ae726b12f4af
Showing with 13 additions and 8 deletions.
  1. +4 −0 changelog.html
  2. +1 −1 core/pom.xml
  3. +2 −2 core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly
  4. +5 −4 pom.xml
  5. +1 −1 war/pom.xml
@@ -55,6 +55,10 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=rfe>
As <a href="http://jenkins-ci.org/content/good-bye-java6">promised</a>, shipping
with Java7 class files.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-28120">issue 28120</a>)
<li class=bug>
<code>Descriptor.getId</code> fix in 1.610 introduced regressions affecting at least the Performance and NodeJS plugins.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-28093">issue 28093</a> and <a href="https://issues.jenkins-ci.org/browse/JENKINS-28110">issue 28110</a>)
@@ -749,7 +749,7 @@ THE SOFTWARE.
<configuration>
<forkCount>0.5C</forkCount>
<reuseForks>true</reuseForks>
<argLine>-XX:MaxPermSize=128m</argLine>
<argLine>-XX:MaxPermSize=128m -noverify</argLine> <!-- some versions of JDK7/8 causes VerifyError during mock tests: http://code.google.com/p/powermock/issues/detail?id=504 -->
</configuration>
</plugin>
<plugin><!-- set main class -->
@@ -50,10 +50,10 @@ THE SOFTWARE.
<j:set var="port" value="${request.getParameter('debugPort')}"/>
<j:choose>
<j:when test="${port!=null}">
<j2se version="1.5+" java-vm-args="${it.launcher.vmargs} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=${port}" />
<j2se version="1.7+" java-vm-args="${it.launcher.vmargs} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=${port}" />
</j:when>
<j:otherwise>
<j2se version="1.5+" java-vm-args="${it.launcher.vmargs}"/>
<j2se version="1.7+" java-vm-args="${it.launcher.vmargs}"/>
</j:otherwise>
</j:choose>
<jar href="${rootURL}jnlpJars/remoting.jar"/>
@@ -359,6 +359,7 @@ THE SOFTWARE.
<artifactId>maven-surefire-plugin</artifactId>
<version>2.16</version> <!-- ignoring ${maven-surefire-plugin.version} -->
<configuration>
<argLine>-noverify</argLine> <!-- some versions of JDK7/8 causes VerifyError during mock tests: http://code.google.com/p/powermock/issues/detail?id=504 -->
<systemPropertyVariables>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
<forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
@@ -604,7 +605,7 @@ THE SOFTWARE.
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java1${java.level}</artifactId>
<artifactId>java16</artifactId>
<version>1.0</version>
</signature>
</configuration>
@@ -614,7 +615,7 @@ THE SOFTWARE.
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.${java.level}</source>
<target>1.${java.level}</target>
<target>1.7</target> <!-- TODO JENKINS-28120 restore to 1.${java.level} -->
<!-- default reuseCreated is more performant
feel free to uncomment if you have any issues on your platform
<compilerReuseStrategy>alwaysNew</compilerReuseStrategy>
@@ -633,13 +634,13 @@ THE SOFTWARE.
<configuration>
<rules>
<requireJavaVersion>
<version>1.6.0-18</version>
<version>1.7.0</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.0</version>
</requireMavenVersion>
<enforceBytecodeVersion>
<maxJdkVersion>1.${java.level}</maxJdkVersion>
<maxJdkVersion>1.7</maxJdkVersion> <!-- TODO JENKINS-28120 restore to 1.${java.level} -->
<ignoreClasses>
<ignoreClass>org.eclipse.jetty.spdy.*</ignoreClass>
</ignoreClasses>
@@ -47,7 +47,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>executable-war</artifactId>
<version>1.29</version>
<version>1.30</version>
<scope>provided</scope>
</dependency>
<dependency>

0 comments on commit e75bea8

Please sign in to comment.
You can’t perform that action at this time.