Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
As the first step of Java7 migration, ship Java7 class files without
requiring Java7 runtime.
  • Loading branch information
kohsuke committed Apr 27, 2015
1 parent ce94434 commit 2826ea3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions changelog.html
Expand Up @@ -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 hreef="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>
Under rare conditions Executor.getProgress() can throw a Division by zero exception.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-28115">issue 28115</a>)
Expand Down
Expand Up @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -101,7 +101,7 @@ THE SOFTWARE.
<matrix-project.version>1.4.1</matrix-project.version>
<animal.sniffer.skip>${skipTests}</animal.sniffer.skip>

<java.level>6</java.level>
<java.level>7</java.level>
</properties>

<repositories>
Expand Down Expand Up @@ -604,7 +604,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>
Expand Down

0 comments on commit 2826ea3

Please sign in to comment.