diff --git a/.gitignore b/.gitignore
index c8e4a244..c87747d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ target/
.idea
.DS_Store
*.iml
+.gradle
+local.properties
+**build
diff --git a/.travis.yml b/.travis.yml
index 10ad3e80..875d8d17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
----
language: java
sudo: true
@@ -6,11 +5,19 @@ matrix:
fast_finish: true
include:
- jdk: openjdk7
- env: MAIN_ARGS="test"
+ env: TASKS="check"
- jdk: oraclejdk7
- env: MAIN_ARGS="test"
+ env: TASKS="check"
- jdk: oraclejdk8
- env: MAIN_ARGS="cobertura:cobertura coveralls:report"
+ env: TASKS="cobertura coveralls"
script:
- - mvn clean $MAIN_ARGS
+ - ./gradlew clean $TASKS
+
+before_cache:
+ - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+
+cache:
+ directories:
+ - $HOME/.gradle/caches/modules-2/
+ - $HOME/.gradle/wrapper/
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..67651910
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,70 @@
+plugins {
+ id 'java'
+ id 'checkstyle'
+ id 'org.jenkins-ci.jpi' version '0.21.0'
+ id 'net.saliman.cobertura' version '2.4.0'
+ id 'com.github.kt3k.coveralls' version '2.7.1'
+}
+
+group = 'org.jenkins-ci.plugins'
+archivesBaseName = 'phabricator-plugin'
+version = '1.9.8-SNAPSHOT'
+description = 'Integrate Jenkins with Phabricator Differentials and Uberalls'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+tasks.withType(JavaCompile) {
+ options.encoding = 'UTF-8'
+}
+
+jenkinsPlugin {
+ coreVersion = '1.609.2'
+ displayName = 'Phabricator Differential Plugin'
+ url = 'https://wiki.jenkins-ci.org/display/JENKINS/Phabricator+Differential+Plugin'
+ gitHubUrl = 'https://github.com/uber/phabricator-jenkins-plugin'
+ shortName = 'phabricator-plugin'
+
+ developers {
+ developer {
+ id 'ai'
+ name 'Aiden Scandella'
+ email 'sc@ndella.com'
+ }
+ }
+
+ licenses {
+ license {
+ name 'MIT License'
+ url 'http://opensource.org/licenses/MIT'
+ }
+ }
+}
+
+dependencies {
+ compile 'org.apache.httpcomponents:httpcore:4.4.1'
+ compile 'org.apache.httpcomponents:httpclient:4.4.1'
+ jenkinsPlugins 'org.jenkins-ci.plugins:credentials:1.22@jar'
+
+ optionalJenkinsPlugins 'org.jenkins-ci.plugins:junit:1.6@jar'
+ optionalJenkinsPlugins 'org.jenkins-ci.plugins:cobertura:1.9.6@jar'
+
+ testCompile 'junit:junit:4.12'
+ testCompile 'org.apache.httpcomponents:httpclient:4.3:tests'
+ testCompile 'net.sf.trove4j:trove4j:3.0.3'
+ testCompile('org.mockito:mockito-core:1.10.19') {
+ exclude module: 'hamcrest-core'
+ }
+
+ jenkinsTest 'org.jenkins-ci.main:jenkins-war:1.609.2@war'
+ jenkinsTest 'org.jenkins-ci.plugins:matrix-project:1.4@jar'
+ jenkinsTest 'org.jenkins-ci.main:jenkins-test-harness:1.609.2@jar'
+}
+
+configurations.all {
+ resolutionStrategy {
+ force 'org.apache.httpcomponents:httpclient:4.3:tests'
+ }
+}
+
+cobertura.coverageFormats = ['html', 'xml']
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 9c59b33e..7a203d60 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -70,6 +70,6 @@
-
+
diff --git a/config/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
similarity index 100%
rename from config/checkstyle-suppressions.xml
rename to config/checkstyle/checkstyle-suppressions.xml
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
new file mode 100644
index 00000000..7a203d60
--- /dev/null
+++ b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..684200a3
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..325d44a5
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Jan 24 13:47:37 PST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..4453ccea
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+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=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/pom.xml b/pom.xml
index 9796b620..d326127c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,12 +148,12 @@
maven-checkstyle-plugin
2.15
- config/checkstyle.xml
+ config/checkstyle/checkstyle.xml
UTF-8
true
true
true
- config/checkstyle-suppressions.xml
+ config/checkstyle/checkstyle-suppressions.xml
checkstyle.suppressions.file
diff --git a/readme.md b/readme.md
index d7b689ca..295ea830 100644
--- a/readme.md
+++ b/readme.md
@@ -133,8 +133,7 @@ Now that you have build status and optionally coverage data set up, check out so
Development
-----------
-Set up your Maven file according to
-https://wiki.jenkins-ci.org/display/JENKINS/Plugin+tutorial.
+Use gradle to perform various development related tasks. [More info](https://wiki.jenkins-ci.org/display/JENKINS/Gradle+JPI+Plugin)
Testing
@@ -142,10 +141,10 @@ Testing
Start up Jenkins with the plugin installed:
```bash
-mvn hpi:run
+./gradlew server
```
-Open your browser to your [local instance](http://localhost:8080/jenkins/).
+Open your browser to your [local instance](http://localhost:8080).
Pull Requests
-------------
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..eba15aaa
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'phabricator-plugin'
diff --git a/src/test/java/com/uber/jenkins/phabricator/coverage/CoberturaXMLParserPatameterizedTest.java b/src/test/java/com/uber/jenkins/phabricator/coverage/CoberturaXMLParserPatameterizedTest.java
index ceeec841..0dffab49 100644
--- a/src/test/java/com/uber/jenkins/phabricator/coverage/CoberturaXMLParserPatameterizedTest.java
+++ b/src/test/java/com/uber/jenkins/phabricator/coverage/CoberturaXMLParserPatameterizedTest.java
@@ -42,9 +42,12 @@ public class CoberturaXMLParserPatameterizedTest {
private static final String TEST_COVERAGE_PYTHON = "python-coverage.xml";
- @Parameterized.Parameter
public Boolean createDirectory;
+ public CoberturaXMLParserPatameterizedTest(Boolean createDirectory) {
+ this.createDirectory = createDirectory;
+ }
+
@Test
public void testDetectCoverageRoot() throws Exception {
File tmpDir = Files.createTempDir();
diff --git a/src/test/java/com/uber/jenkins/phabricator/coverage/PathResolverTest.java b/src/test/java/com/uber/jenkins/phabricator/coverage/PathResolverTest.java
index 536ce7e7..e6a85f40 100644
--- a/src/test/java/com/uber/jenkins/phabricator/coverage/PathResolverTest.java
+++ b/src/test/java/com/uber/jenkins/phabricator/coverage/PathResolverTest.java
@@ -35,11 +35,14 @@
@RunWith(Parameterized.class)
public class PathResolverTest {
- @Parameterized.Parameter
public List candidates;
private Stack cleanupPaths;
+ public PathResolverTest(List candidates) {
+ this.candidates = candidates;
+ }
+
@Test
public void testChoose() throws Exception {
File tmpDir = Files.createTempDir();
@@ -81,11 +84,11 @@ public void tearDown() {
}
@Parameterized.Parameters
- public static Collection> data() {
- return Arrays.asList(
- new ArrayList(),
- Arrays.asList("workspace/", "workspace/dir/", "workspace/dir/file"),
- Arrays.asList("workspace/", "workspace/dir/", "workspace/dir/dir/", "workspace/dir/file")
- );
+ public static Collection data() {
+ Collection result = new ArrayList();
+ result.add(new Object[] { Collections.emptyList() });
+ result.add(new Object[] { Arrays.asList("workspace/", "workspace/dir/", "workspace/dir/file") });
+ result.add(new Object[] { Arrays.asList("workspace/", "workspace/dir/", "workspace/dir/dir/", "workspace/dir/file") });
+ return result;
}
}