Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Changing gradlew version to 1.2 to support Java 8 #84

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ task syncWithRepo(dependsOn: 'classes', type: JavaExec) {
}

task wrapper(type: Wrapper) {
gradleVersion = '1.0'
gradleVersion = '1.2'
}


Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jun 20 11:41:01 CDT 2012
#Tue Apr 07 23:19:43 IDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip
4 changes: 2 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

##############################################################################
##
Expand Down Expand Up @@ -101,7 +101,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/com/entagen/jenkins/Main.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class Main {
Map <String, String> mergedArgs = [:]
opts.each { String shortOpt, Map<String, String> optMap ->
if (optMap.argName) {
mergedArgs[optMap.argName] = commandLineOptions."$shortOpt" ?: System.getProperty(optMap.argName)
mergedArgs[optMap.argName] = commandLineOptions."$shortOpt" ?: System.getProperty(optMap.argName) ?: System.env.get(optMap.argName)
}
}
return mergedArgs.findAll { k, v -> v }
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/com/entagen/jenkins/TemplateJob.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class TemplateJob {

String jobNameForBranch(String branchName) {
// git branches often have a forward slash in them, but they make jenkins cranky, turn it into an underscore
String safeBranchName = branchName.replaceAll('/', '_')
String safeBranchName = branchName.replaceAll("[^a-zA-Z0-9_]", "_")
return "$baseJobName-$safeBranchName"
}

Expand Down