Index: /applications/editors/josm/plugins/mapillary/.classpath
===================================================================
--- /applications/editors/josm/plugins/mapillary/.classpath (revision 32284)
+++ /applications/editors/josm/plugins/mapillary/.classpath (revision 32285)
@@ -4,5 +4,5 @@
-
+
Index: /applications/editors/josm/plugins/mapillary/INSTALL.md
===================================================================
--- /applications/editors/josm/plugins/mapillary/INSTALL.md (revision 32284)
+++ /applications/editors/josm/plugins/mapillary/INSTALL.md (revision 32285)
@@ -66,5 +66,5 @@
git rev-parse master > .git/refs/remotes/svn/git-svn # creates a file containing the SHA1 of master-branch
git svn fetch
-git reset --hard svn/git-svn
+git reset --hard svn/git-svn # Make sure you have no uncommitted changes in your repo before doing this
```
Index: /applications/editors/josm/plugins/mapillary/build.gradle
===================================================================
--- /applications/editors/josm/plugins/mapillary/build.gradle (revision 32284)
+++ /applications/editors/josm/plugins/mapillary/build.gradle (revision 32285)
@@ -6,5 +6,5 @@
apply plugin: 'project-report'
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
repositories {
@@ -28,8 +28,9 @@
}
}
+
dependencies {
// The JOSM-version can be specified as "latest", "tested" or the numeric version number.
// When using a numeric version number you can leave out {changing=true}.
- compile(':josm:9811')
+ compile(':josm:10327')
// For plugins it's irrelevant, which version is specified, always the latest version is used.
compile (name: 'apache-commons'){changing=true}
@@ -75,8 +76,8 @@
pmd {
- toolVersion '5.4.1'
+ toolVersion project.property('tools.pmd.version')
ignoreFailures true
- targetJdk sourceCompatibility
- ruleSetFiles = files('.settings/pmd-ruleset.xml')
+ targetJdk 1.7 // 1.8 is not yet available
+ ruleSetConfig = resources.text.fromFile('.settings/pmd-ruleset.xml')
}
@@ -90,5 +91,5 @@
/** FindBugs configuration */
findbugs {
- toolVersion = "3.0.1"
+ toolVersion = project.property('tools.findbugs.version')
ignoreFailures = true
effort = "max"
@@ -104,5 +105,5 @@
/** JaCoCo configuration */
jacoco {
- toolVersion = "0.7.5.201505241946"
+ toolVersion = project.property('tools.jacoco.version')
}
jacocoTestReport {
Index: /applications/editors/josm/plugins/mapillary/gradle.properties
===================================================================
--- /applications/editors/josm/plugins/mapillary/gradle.properties (revision 32284)
+++ /applications/editors/josm/plugins/mapillary/gradle.properties (revision 32285)
@@ -11,2 +11,6 @@
#plugin.early=...
#plugin.stage=...
+
+tools.pmd.version=5.4.2
+tools.findbugs.version=3.0.1
+tools.jacoco.version=0.7.7.201606060606
Index: /applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- /applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties (revision 32284)
+++ /applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties (revision 32285)
@@ -3,4 +3,4 @@
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
-distributionSha256Sum=8d7437082356c9fd6309a4479c8db307673965546daea445c6c72759cd6b1ed6
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionSha256Sum=65bbc0ef9c48be86fb06522fc927d59dcc7c04266f2bb8156be76971f7c3fc4a
Index: /applications/editors/josm/plugins/mapillary/gradlew
===================================================================
--- /applications/editors/josm/plugins/mapillary/gradlew (revision 32284)
+++ /applications/editors/josm/plugins/mapillary/gradlew (revision 32285)
@@ -7,9 +7,27 @@
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# 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.
@@ -31,4 +49,5 @@
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
@@ -41,23 +60,8 @@
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-
-# 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
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -86,5 +90,5 @@
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
Index: /applications/editors/josm/plugins/mapillary/gradlew.bat
===================================================================
--- /applications/editors/josm/plugins/mapillary/gradlew.bat (revision 32284)
+++ /applications/editors/josm/plugins/mapillary/gradlew.bat (revision 32285)
@@ -9,11 +9,11 @@
if "%OS%"=="Windows_NT" setlocal
-@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=
-
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
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=
@rem Find java.exe