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

Gradle wrapper upgrade & cleanup #59

Open
wants to merge 1 commit 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*.diff
build
.gradle
.idea

out
atlassian-ide-plugin.xml
10 changes: 0 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,3 @@ task syncWithRepo(dependsOn: 'classes', type: JavaExec) {
}

}

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






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
#Mon Mar 31 18:37:47 CDT 2014
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.10-bin.zip
8 changes: 4 additions & 4 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 @@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/"
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED"
cd "$SAVED" >&-

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

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
8 changes: 1 addition & 7 deletions src/main/groovy/com/entagen/jenkins/JenkinsApi.groovy
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.entagen.jenkins

import groovyx.net.http.ContentType
import groovyx.net.http.HTTPBuilder
import groovyx.net.http.RESTClient
import static groovyx.net.http.ContentType.*
import org.apache.http.conn.HttpHostConnectException
Expand Down Expand Up @@ -197,12 +196,7 @@ class JenkinsApi {
params[crumbInfo.field] = crumbInfo.crumb
}






HTTPBuilder http = new HTTPBuilder(jenkinsServerUrl)
RESTClient http = new RESTClient(jenkinsServerUrl)

if (requestInterceptor) {
http.client.addRequestInterceptor(this.requestInterceptor)
Expand Down
6 changes: 0 additions & 6 deletions src/main/groovy/com/entagen/jenkins/JenkinsApiReadOnly.groovy
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
package com.entagen.jenkins

import groovyx.net.http.ContentType
import groovyx.net.http.HTTPBuilder
import groovyx.net.http.RESTClient
import org.apache.http.client.HttpResponseException
import org.apache.http.conn.HttpHostConnectException

import static groovyx.net.http.ContentType.TEXT
import org.apache.http.HttpStatus

class JenkinsApiReadOnly extends JenkinsApi {
Expand Down
2 changes: 0 additions & 2 deletions src/main/groovy/com/entagen/jenkins/JenkinsJobManager.groovy
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.entagen.jenkins

import java.util.regex.Pattern

class JenkinsJobManager {
String templateJobPrefix
String templateBranchName
Expand Down