Skip to content
Permalink
Browse files

[JENKINS-28120]

Reflecting more code review comments from
#1679

- Jesse wants to keep the variable pointing to 1.6
- Update executable-war so that it fails gracefully if run with Java6 or
  earlier.
- CI build fails with VerifyError due to a regression in JDK.
  To support wide range of development environment, just cut off the
  verifier.
- Have enforcer require 1.7 although javac fails in a kinda obvious way.
  • Loading branch information
kohsuke committed Apr 29, 2015
1 parent de8bba4 commit 18fa9363c2df5deba4a64e0b44d6417b324049ad
Showing with 6 additions and 5 deletions.
  1. +5 −4 pom.xml
  2. +1 −1 war/pom.xml
@@ -101,7 +101,7 @@ THE SOFTWARE.
<matrix-project.version>1.4.1</matrix-project.version>
<animal.sniffer.skip>${skipTests}</animal.sniffer.skip>

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

<repositories>
@@ -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>
@@ -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 18fa936

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