Changeset 32285 in osm

Timestamp:

2016-06-16T15:25:29+02:00 (9 years ago)

Author:

floscher

Message:

Update several tools to their latest version

These are:

• Java now uses source compatibility of 1.8 instead of 1.7 for compiling
• Gradle 2.14
• PMD 5.4.2
• JaCoCo 0.7.7

Location:

applications/editors/josm/plugins/mapillary

Files:

• .classpath (modified) (1 diff)
• INSTALL.md (modified) (1 diff)
• build.gradle (modified) (5 diffs)
• gradle.properties (modified) (1 diff)
• gradle/wrapper/gradle-wrapper.jar (modified) ( previous)
• gradle/wrapper/gradle-wrapper.properties (modified) (1 diff)
• gradlew (modified) (4 diffs)
• gradlew.bat (modified) (1 diff)

applications/editors/josm/plugins/mapillary/.classpath

@@ -4 +4 @@
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="src" path="test/unit"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
         <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>

applications/editors/josm/plugins/mapillary/INSTALL.md

@@ -66 +66 @@
 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
 ```
 

applications/editors/josm/plugins/mapillary/build.gradle

@@ -6 +6 @@
 apply plugin: 'project-report'
 
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 
 repositories {
@@ -28 +28 @@
   }
 }
+
 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 +76 @@
 
 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 +91 @@
 /** FindBugs configuration */
 findbugs {
-  toolVersion = "3.0.1"
+  toolVersion = project.property('tools.findbugs.version')
   ignoreFailures = true
   effort = "max"
@@ -104 +105 @@
 /** JaCoCo configuration */
 jacoco {
-  toolVersion = "0.7.5.201505241946"
+  toolVersion = project.property('tools.jacoco.version')
 }
 jacocoTestReport {

applications/editors/josm/plugins/mapillary/gradle.properties

@@ -11 +11 @@
 #plugin.early=...
 #plugin.stage=...
+
+tools.pmd.version=5.4.2
+tools.findbugs.version=3.0.1
+tools.jacoco.version=0.7.7.201606060606

applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties

@@ -3 +3 @@
 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

applications/editors/josm/plugins/mapillary/gradlew

@@ -7 +7 @@
 ##############################################################################
 
-# 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 +49 @@
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
@@ -41 +60 @@
     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 +90 @@
 
 # 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

applications/editors/josm/plugins/mapillary/gradlew.bat

@@ -9 +9 @@
 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