Index: applications/editors/josm/plugins/mapillary/gradle.properties
===================================================================
--- applications/editors/josm/plugins/mapillary/gradle.properties	(revision 32866)
+++ applications/editors/josm/plugins/mapillary/gradle.properties	(revision 32867)
@@ -14,5 +14,5 @@
 plugin.jar.name=Mapillary
 
-tool.pmd.version=5.5.0
+tool.pmd.version=5.5.1
 tool.findbugs.version=3.0.1
 tool.jacoco.version=0.7.7.201606060606
Index: applications/editors/josm/plugins/mapillary/gradle/tool-config.gradle
===================================================================
--- applications/editors/josm/plugins/mapillary/gradle/tool-config.gradle	(revision 32866)
+++ applications/editors/josm/plugins/mapillary/gradle/tool-config.gradle	(revision 32867)
@@ -26,5 +26,5 @@
   toolVersion project.property('tool.pmd.version')
   ignoreFailures true
-  targetJdk 1.7 // 1.8 is not yet available (as of Gradle 2.14.1, see https://docs.gradle.org/current/javadoc/org/gradle/api/plugins/quality/TargetJdk.html)
+  targetJdk 1.7 // 1.8 is not yet available (as of Gradle 3.0, see https://docs.gradle.org/current/javadoc/org/gradle/api/plugins/quality/TargetJdk.html)
   ruleSetConfig = resources.text.fromFile('config/pmd/ruleset.xml')
 }
Index: applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties	(revision 32866)
+++ applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties	(revision 32867)
@@ -3,4 +3,4 @@
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
-distributionSha256Sum=88a910cdf2e03ebbb5fe90f7ecf534fc9ac22e12112dc9a2fee810c598a76091
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
+distributionSha256Sum=9c8b7564ea6a911b5b9fcadd60f3a6cea4238413c8b1e1dd14400a50954aab99
Index: applications/editors/josm/plugins/mapillary/gradlew
===================================================================
--- applications/editors/josm/plugins/mapillary/gradlew	(revision 32866)
+++ applications/editors/josm/plugins/mapillary/gradlew	(revision 32867)
@@ -162,3 +162,8 @@
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
Index: applications/editors/josm/plugins/mapillary/gradlew.bat
===================================================================
--- applications/editors/josm/plugins/mapillary/gradlew.bat	(revision 32866)
+++ applications/editors/josm/plugins/mapillary/gradlew.bat	(revision 32867)
@@ -50,5 +50,4 @@
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
@@ -61,9 +60,4 @@
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute