Skip to content

Commit

Permalink
updated Java to version 8
Browse files Browse the repository at this point in the history
  • Loading branch information
daspilker committed Jan 30, 2018
1 parent 8667bab commit 4fe5f28
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
@@ -1,4 +1,4 @@
#!/usr/bin/env groovy

/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
buildPlugin(jdkVersions: [7])
buildPlugin()
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -24,8 +24,8 @@ configure(subprojects - project(':job-dsl-api-viewer')) {
apply plugin: 'maven' // for publishing
apply plugin: 'codenarc'

sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8

dependencies {
compile "org.codehaus.groovy:groovy-all:${groovyVersion}"
Expand Down
1 change: 1 addition & 0 deletions docs/Home.md
Expand Up @@ -29,6 +29,7 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins

## Release Notes
* 1.68 (unreleased)
* Increased the minimum supported Java version to JDK 8
* Increased the minimum supported Jenkins version to 2.73
* Un-deprecated support for the
[PostBuildScript Plugin](https://wiki.jenkins-ci.org/display/JENKINS/PostBuildScript+Plugin)
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Expand Up @@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS="-XX:MaxPermSize=256m"
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Expand Up @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=-XX:MaxPermSize=256m
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
1 change: 0 additions & 1 deletion job-dsl-plugin/build.gradle
Expand Up @@ -62,7 +62,6 @@ clean {
}

test {
jvmArgs += ['-XX:MaxPermSize=256m']
/* TODO useful in conjunction with BuildWatcher, but better to enable conditionally (in jpi plugin?) as in https://github.com/jenkinsci/plugin-pom/blob/d1c2e7dc75692014184260f6d975bac36b1123b1/pom.xml#L955-L965
testLogging {
showStandardStreams = true
Expand Down

0 comments on commit 4fe5f28

Please sign in to comment.