Index: /applications/editors/josm/plugins/wikipedia/build.gradle
===================================================================
--- /applications/editors/josm/plugins/wikipedia/build.gradle	(revision 34174)
+++ /applications/editors/josm/plugins/wikipedia/build.gradle	(revision 34174)
@@ -0,0 +1,95 @@
+plugins {
+  id "java"
+  id "eclipse"
+  id "pmd"
+  id "com.github.ben-manes.versions" version "0.17.0"
+  id "com.github.spotbugs" version "1.6.1"
+  id "net.ltgt.errorprone" version "0.0.13"
+  id "org.openstreetmap.josm" version "0.4.0"
+}
+def versions = [
+    errorprone: "2.3.1",
+    junit: "5.1.1",
+    pmd: "6.2.0",
+    spotbugs: "3.1.3"
+]
+
+// Set up ErrorProne
+dependencies.errorprone "com.google.errorprone:error_prone_core:${versions.errorprone}"
+tasks.withType(JavaCompile) {
+  options.compilerArgs += [
+    '-Xep:DefaultCharset:ERROR',
+    '-Xep:ClassCanBeStatic:ERROR',
+    '-Xep:StringEquality:ERROR',
+    '-Xep:WildcardImport:WARN',
+    '-Xep:MethodCanBeStatic:WARN',
+    '-Xep:RemoveUnusedImports:WARN',
+    '-Xep:PrivateConstructorForUtilityClass:WARN',
+    '-Xep:LambdaFunctionalInterface:WARN',
+    '-Xep:ConstantField:WARN'
+  ]
+}
+
+pmd {
+  toolVersion = versions.pmd
+  ignoreFailures true
+  ruleSets = []
+  ruleSetConfig = resources.text.fromFile("$projectDir/config/pmd/ruleset.xml")
+  sourceSets = [sourceSets.main]
+}
+
+spotbugs {
+  toolVersion = versions.spotbugs
+  ignoreFailures = true
+  sourceSets = [sourceSets.main]
+}
+tasks.withType(com.github.spotbugs.SpotBugsTask) {
+  reports {
+    xml.enabled = false
+    html.enabled = true
+  }
+}
+
+sourceSets {
+  main {
+    java {
+      srcDirs = ["src"]
+    }
+    lang {
+      srcDirs = ["data"]
+    }
+    resources {
+      srcDirs = ["$projectDir"]
+      include "images/**"
+      include "GPL-v2.0.txt"
+      include "README"
+    }
+  }
+  test {
+    java {
+      srcDirs = ["test/unit"]
+    }
+  }
+}
+
+repositories {
+  jcenter()
+}
+dependencies {
+  testImplementation "org.junit.jupiter:junit-jupiter-api:${versions.junit}"
+  testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${versions.junit}"
+  testImplementation "org.junit.vintage:junit-vintage-engine:${versions.junit}"
+  testImplementation "com.github.spotbugs:spotbugs-annotations:${versions.spotbugs}"
+  testImplementation("org.openstreetmap.josm:josm-unittest:"){changing=true}
+}
+
+version = "34161"
+josm {
+  josmCompileVersion = "13600"
+  manifest {
+    // Description is duplicated in build.xml, because only there it is synced to Launchpad for translation
+    description = "Simplifies linking OSM objects to Wikipedia articles and Wikidata items"
+    oldVersionDownloadLink 12900, "34109", new URL("https://svn.openstreetmap.org/applications/editors/josm/dist/wikipedia.jar?p=34113")
+    oldVersionDownloadLink 12878, "33635", new URL("https://svn.openstreetmap.org/applications/editors/josm/dist/wikipedia.jar?p=33636")
+  }
+}
Index: /applications/editors/josm/plugins/wikipedia/build.xml
===================================================================
--- /applications/editors/josm/plugins/wikipedia/build.xml	(revision 34173)
+++ /applications/editors/josm/plugins/wikipedia/build.xml	(revision 34174)
@@ -4,13 +4,9 @@
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Commit message"/>
-    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13597"/>
-    <property name="plugin.canloadatruntime" value="true"/>
 
-    <property name="plugin.author" value="simon04"/>
-    <property name="plugin.class" value="org.wikipedia.WikipediaPlugin"/>
+    <!-- edit the properties of this plugin in the file `gradle.properties` -->
+    <property file="${basedir}/gradle.properties"/>
+    <!-- The description has to stay here AND in the build.gradle, so Ant can sync the description to Launchpad and Gradle can also pick it up. -->
     <property name="plugin.description" value="Simplifies linking OSM objects to Wikipedia articles and Wikidata items"/>
-    <property name="plugin.icon" value="images/dialogs/wikipedia.png"/>
-    <property name="plugin.link" value="https://josm.openstreetmap.de/wiki/Help/Plugin/Wikipedia"/>
 
     <!-- ** include targets that all plugins have in common ** -->
Index: /applications/editors/josm/plugins/wikipedia/config/pmd/ruleset.xml
===================================================================
--- /applications/editors/josm/plugins/wikipedia/config/pmd/ruleset.xml	(revision 34174)
+++ /applications/editors/josm/plugins/wikipedia/config/pmd/ruleset.xml	(revision 34174)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<ruleset name="Ruleset for josm-mapillary-plugin"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+  <description>
+    This ruleset checks some rules that you should normally follow for the JOSM-wikipedia plugin.
+  </description>
+  <rule ref="category/java/bestpractices.xml"/>
+  <rule ref="category/java/codestyle.xml">
+    <exclude name="AbstractNaming"/>
+    <exclude name="AvoidFinalLocalVariable"/>
+    <exclude name="CommentDefaultAccessModifier"/>
+    <exclude name="DefaultPackage"/>
+    <exclude name="LongVariable"/>
+    <exclude name="MethodArgumentCouldBeFinal"/><!-- way too many -->
+    <exclude name="ShortVariable"/>
+  </rule>
+  <rule ref="category/java/design.xml">
+    <exclude name="LawOfDemeter"/>
+    <exclude name="LoosePackageCoupling"/>
+  </rule>
+  <rule ref="category/java/errorprone.xml"/>
+  <rule ref="category/java/multithreading.xml/AvoidThreadGroup"/>
+  <rule ref="category/java/multithreading.xml/DontCallThreadRun"/>
+  <rule ref="category/java/multithreading.xml/NonThreadSafeSingleton" />
+</ruleset>
Index: /applications/editors/josm/plugins/wikipedia/gradle.properties
===================================================================
--- /applications/editors/josm/plugins/wikipedia/gradle.properties	(revision 34174)
+++ /applications/editors/josm/plugins/wikipedia/gradle.properties	(revision 34174)
@@ -0,0 +1,6 @@
+plugin.main.version = 13597
+plugin.canloadatruntime = true
+plugin.author = simon04
+plugin.class = org.wikipedia.WikipediaPlugin
+plugin.icon = images/dialogs/wikipedia.png
+plugin.link = https://josm.openstreetmap.de/wiki/Help/Plugin/Wikipedia
Index: /applications/editors/josm/plugins/wikipedia/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- /applications/editors/josm/plugins/wikipedia/gradle/wrapper/gradle-wrapper.properties	(revision 34174)
+++ /applications/editors/josm/plugins/wikipedia/gradle/wrapper/gradle-wrapper.properties	(revision 34174)
@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionSha256Sum=203f4537da8b8075e38c036a6d14cb71b1149de5bf0a8f6db32ac2833a1d1294
Index: /applications/editors/josm/plugins/wikipedia/gradlew
===================================================================
--- /applications/editors/josm/plugins/wikipedia/gradlew	(revision 34174)
+++ /applications/editors/josm/plugins/wikipedia/gradlew	(revision 34174)
@@ -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" "$@"
Index: /applications/editors/josm/plugins/wikipedia/gradlew.bat
===================================================================
--- /applications/editors/josm/plugins/wikipedia/gradlew.bat	(revision 34174)
+++ /applications/editors/josm/plugins/wikipedia/gradlew.bat	(revision 34174)
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+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
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+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%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega