Update dependencies, set minJavaVersion to 11 (due to Atlas only supporting Java 11)

.travis/build.sh

@@ -2,4 +2,4 @@
 
 chmod u+x gradlew
 
-./gradlew clean build minJosmVersionClasses
+./gradlew clean build compileJava_minJosm compileJava_latestJosm compileJava_testedJosm

build.gradle

@@ -1,10 +1,13 @@
 plugins {
-    id 'org.openstreetmap.josm' version '0.3.4'
-    id 'com.diffplug.gradle.spotless' version '3.9.0'
+    id 'org.openstreetmap.josm' version '0.7.1'
+    id 'com.diffplug.gradle.spotless' version '4.5.1'
     // Used to promote a staging release build
     // https://github.com/Codearte/gradle-nexus-staging-plugin
     // gradle closeAndReleaseRepository
-    id "io.codearte.nexus-staging" version "0.11.0"
+    id "io.codearte.nexus-staging" version "0.22.0"
+
+    // Used to find updated versions
+    id "com.github.ben-manes.versions" version "0.33.0"
 
     id 'java'
     id 'checkstyle'
@@ -18,12 +21,12 @@ plugins {
 checkstyle {
     toolVersion = '8.10.1'
 }
-josm { // see https://floscher.github.io/gradle-josm-plugin/kdoc/v0.3.4/gradle-josm-plugin/org.openstreetmap.josm.gradle.plugin.config/-josm-plugin-extension
-    josmCompileVersion '13959'
-    manifest.minJosmVersion = '13957'
+josm { // see https://floscher.gitlab.io/gradle-josm-plugin/kdoc/latest/plugin/plugin/org.openstreetmap.josm.gradle.plugin.config/-josm-plugin-extension/index.html
+    josmCompileVersion '14139'
+    manifest.minJosmVersion = '14119'
 }
 ext.versions = [
-    'atlas': '5.5.0'
+    'atlas': '6.3.2'
 ]
 
 // corresponds to POM description/group
@@ -33,21 +36,22 @@ group = 'org.openstreetmap.atlas'
 
 // JOSM plugin configuration
 archivesBaseName = 'josm-atlas'
-josm.manifest { // see https://floscher.github.io/gradle-josm-plugin/kdoc/v0.3.4/gradle-josm-plugin/org.openstreetmap.josm.gradle.plugin.config/-josm-manifest
+josm.manifest { // see https://floscher.gitlab.io/gradle-josm-plugin/kdoc/latest/plugin/plugin/org.openstreetmap.josm.gradle.plugin.config/-josm-manifest/index.html
     author = 'James Gage'
     canLoadAtRuntime = true
     description = 'Allows you to view an Atlas file as a layer.'
     iconPath = 'images/dialogs/world-3.png'
     mainClass = 'org.openstreetmap.atlas.AtlasReader'
     website = new URL('https://github.com/osmlab/josm-atlas')
+    minJavaVersion = 11
 }
 
 sourceCompatibility=1.8
-targetCompatibility=1.8
+targetCompatibility=11
 
 repositories {
     // For geotools
-    maven { url "http://download.osgeo.org/webdav/geotools/" }
+    maven { url "http://repo.osgeo.org/repository/release/" }
     mavenCentral()
 }
 

config/checkstyle/checkstyle.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
-
+	"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+	"https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="Checker">
 	<module name="NewlineAtEndOfFile" />
 	<module name="TreeWalker">
 		<!-- Checks for Javadoc comments. -->
 		<module name="JavadocMethod">
 			<property name="scope" value="protected" />
 			<property name="excludeScope" value="private" />
-			<property name="allowMissingJavadoc" value="true" />
-			<property name="allowUndeclaredRTE" value="true" />
+			<!--allowMissingJavadoc was removed in checkstyle-->
+			<!--This kind of replaces allowMissingJavadoc-->
+			<property name="minLineCount" value="50"/>
+			<!--allowUndeclaredRTE was removed in checkstyle-->
+			<!--<property name="allowUndeclaredRTE" value="true" />-->
 		</module>
 		<module name="JavadocType">
 			<property name="authorFormat" value="\S" />
@@ -55,7 +57,7 @@
 		<module name="UnusedImports">
 			<property name="processJavadoc" value="true" />
 		</module>
-		
+
 		<!-- Checks for metrics -->
 
 		<!-- Checks for Size Violations. -->
@@ -143,6 +145,6 @@
 	</module>
 
 	<module name="SuppressionFilter">
-		<property name="file" value="config/checkstyle/suppressions.xml" />
+		<property name="file" value="${config_loc}/suppressions.xml" />
 	</module>
-</module>
+</module>

config/checkstyle/suppressions.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-	<suppress checks="MagicNumberCheck" files="src/test/*" />
-	<suppress checks="MagicNumberCheck" files="src/integrationTest/*" />
+	<suppress checks="MagicNumber" files="src/test/*" />
+	<suppress checks="MagicNumber" files="src/integrationTest/*" />
 	<suppress checks="MultipleStringLiterals" files="src/test/*" />
 	<suppress checks="MultipleStringLiterals" files="src/integrationTest/*" />
 	<suppress checks="InnerAssignment" files="src/test/*" />

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionSha256Sum=8ad57759019a9233dc7dc4d1a530cefe109dc122000d57f7e623f8cf4ba9dfc4
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ 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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ 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
@@ -109,10 +126,11 @@ 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
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $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" ;;
+        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
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+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" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @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 DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/org/openstreetmap/atlas/data/AtlasDataSet.java

@@ -17,7 +17,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataIntegrityProblemException;
@@ -38,13 +37,14 @@
 import org.openstreetmap.josm.data.osm.Storage;
 import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
  * Atlas data set
- * 
+ *
  * @author Vincent Privat
  */
 public final class AtlasDataSet
@@ -205,7 +205,7 @@ public AtlasPrimitive getPrimitiveById(final PrimitiveId primitiveId)
 
     /**
      * Show message and stack trace in log in case primitive is not found
-     * 
+     *
      * @param primitiveId
      *            primitive id to look for
      * @return Primitive by id.
@@ -219,7 +219,7 @@ private AtlasPrimitive getPrimitiveByIdChecked(final PrimitiveId primitiveId)
                     "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. Please report this "
                             + "at {2}. This is not a critical error, it should be safe to continue in your work.",
                     primitiveId.getType(), Long.toString(primitiveId.getUniqueId()),
-                    Main.getJOSMWebsite()));
+                    Config.getUrls().getJOSMWebsite()));
             Logging.error(new Exception());
         }
 
@@ -389,7 +389,7 @@ private Set<AtlasPrimitive> toAtlasPrimitives(final Set<OsmPrimitive> set)
      * Do a selection change.
      * <p>
      * This is the only method that changes the current selection state.
-     * 
+     *
      * @param command
      *            A generator that generates the {@link SelectionChangeEvent} for the given base set
      *            of currently selected primitives.
@@ -490,7 +490,7 @@ public void removeSelectionListener(final DataSelectionListener listener)
      * Returns mappaint cache index for this DataSet. If the {@link OsmPrimitive#mappaintCacheIdx}
      * is not equal to the DataSet mappaint cache index, this means the cache for that primitive is
      * out of date.
-     * 
+     *
      * @return mappaint cache index
      */
     public short getMappaintCacheIndex()