josm-mirror: bumped externals

.classpath

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry excluding="org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/xz/|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lzw/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/z/" kind="src" path="src"/>
 	<classpathentry kind="src" path="test/unit"/>
 	<classpathentry kind="src" path="test/functional"/>
 	<classpathentry kind="src" path="test/performance"/>
-	<classpathentry excluding="build/|data_nodist/|dist/|doc/|lib/|macosx/|nb/|src/|test/|test/build/|test/functional/|test/performance/|test/unit/|tools/|utils/" kind="src" path=""/>
+	<classpathentry excluding="build/|data_nodist/|dist/|linux/|macosx/|nb/|src/|test/|test/build/|test/functional/|test/performance/|test/unit/|tools/|utils/|windows/" kind="src" path=""/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar"/>
@@ -13,7 +13,7 @@
 	<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_65"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_76"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>
 	<classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.3.jar"/>

.settings/org.eclipse.jdt.core.prefs

@@ -6,6 +6,7 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7

.settings/org.eclipse.jdt.groovy.core.prefs

@@ -1,2 +1,2 @@
 eclipse.preferences.version=1
-groovy.compiler.level=-1
+groovy.compiler.level=23

CONTRIBUTION

@@ -1,78 +1,83 @@
-JOSM was originally designed and coded by Immanuel Scholz,
-and is now maintained by the OpenStreetMap community.
-
-The current JOSM maintainer is Dirk Stöcker.
-A lot of administration work is done by Paul Hartmann and Vincent Privat.
-
-Major code contributions from (in alphabetical order):
-
-Stefan Breunig
-David Earl
-Gabriel Ebner
-Dave Hansen
-Paul Hartmann
-Karl Guggisberg
-Matthias Julius
-Alexei Kasatkin
-Jiri Klement
-Ulf Lamping
-Simon Legner
-Raphael Mack
-Upliner Mikhalych
-Vincent Privat
-Frederik Ramm
-Dirk Stöcker
-
-Many minor contributions and patches by others; see SVN history
-at http://josm.openstreetmap.de/svn/ for details. Use
-"josm-dev AT openstreetmap.org" to contact still active authors.
-
-Copyright rests with the contributors.
-
--------------------------------- EXTERNAL CODE --------------------------------
-
-The jpeg metadata extraction code is from Drew Noakes
-(http://code.google.com/p/metadata-extractor/) and licensed
-with Apache license version 2.0.
-
-The Bzip2 code is from Keiron Liddle (Apache project) and licensed
-with Apache license version 2.0.
-
-The signpost code (http://code.google.com/p/oauth-signpost/)
-is from Matthias Käppler and licensed with the Apache License 2.0.
-
-The NTv2 transformation code (http://jgridshift.sourceforge.net/)
-is from Peter Yuill and licensed with LGPL.
-
-The MultiSplitPane is from Hans Muller and licensed with LGPL
-(https://today.java.net/pub/a/today/2006/03/23/multi-split-pane.html).
-
-The Alphanum Algorithm is from David Koelle and license with LGPL
-(http://www.davekoelle.com/alphanum.html)
-
-The Diff code (http://www.bmsi.com/java/#diff) 
-is from Stuart D. Gathman and licensed with GPL.
-
-The Ellipsoid code (http://www.i3s.unice.fr/~johan/gps/)
-is from Johan Montagnat and licensed with GPL.
-
-The JSON code (https://java.net/projects/jsonp/)
-is from Oracle (RI for JSR 353: Java API for JSON Processing) 
-and licensed with GPL / classpath exception.
-
-The opening hour validation uses code from opening_hour.js
-(https://github.com/ypid/opening_hours.js) which is licensed
-with the New (2-clause) BSD license.
-
------------------------------------- ICONS ------------------------------------
-
-Most icons have been nicked from GNOME and the GIMP, both under GPL. 
-Some are originally LGPL but redistributed here under GPL. 
-
-The keyboard icon comes fom:
-- source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
-- licence: GPL
-- designer: Paolino, http://www.paolinoland.it/
-- original filename: keyboard.png
-- original size: 128x128
-- modifications: icon was cropped, then resized
+JOSM was originally designed and coded by Immanuel Scholz,
+and is now maintained by the OpenStreetMap community.
+
+The current JOSM maintainer is Dirk Stöcker.
+A lot of administration work is done by Paul Hartmann and Vincent Privat.
+
+Major code contributions from (in alphabetical order):
+
+Stefan Breunig
+David Earl
+Gabriel Ebner
+Dave Hansen
+Paul Hartmann
+Karl Guggisberg
+Matthias Julius
+Alexei Kasatkin
+Jiri Klement
+Ulf Lamping
+Simon Legner
+Raphael Mack
+Upliner Mikhalych
+Vincent Privat
+Frederik Ramm
+Dirk Stöcker
+
+Many minor contributions and patches by others; see SVN history
+at http://josm.openstreetmap.de/svn/ for details. Use
+"josm-dev AT openstreetmap.org" to contact still active authors.
+
+The logo has been designed by Ilya Palikov.
+
+Copyright rests with the contributors.
+
+-------------------------------- EXTERNAL CODE --------------------------------
+
+The jpeg metadata extraction code is from Drew Noakes
+(http://code.google.com/p/metadata-extractor/) and licensed
+with Apache license version 2.0.
+
+The Bzip2 code is from Apache Commons Compress and licensed
+with Apache license version 2.0.
+
+The signpost code (http://code.google.com/p/oauth-signpost/)
+is from Matthias Käppler and licensed with the Apache License 2.0.
+
+The mail/url validator routines use code from Apache Commons
+Validator which is licensed with Apache license version 2.0.
+
+The NTv2 transformation code (http://jgridshift.sourceforge.net/)
+is from Peter Yuill and licensed with LGPL.
+
+The MultiSplitPane is from Hans Muller and licensed with LGPL
+(https://today.java.net/pub/a/today/2006/03/23/multi-split-pane.html).
+
+The Alphanum Algorithm is from David Koelle and license with LGPL
+(http://www.davekoelle.com/alphanum.html)
+
+The Diff code (http://www.bmsi.com/java/#diff) 
+is from Stuart D. Gathman and licensed with GPL.
+
+The Ellipsoid code (http://www.i3s.unice.fr/~johan/gps/)
+is from Johan Montagnat and licensed with GPL.
+
+The JSON code (https://java.net/projects/jsonp/)
+is from Oracle (RI for JSR 353: Java API for JSON Processing) 
+and licensed with GPL / classpath exception.
+
+The opening hour validation uses code from opening_hour.js
+(https://github.com/ypid/opening_hours.js) which is licensed
+with the New (2-clause) BSD license.
+
+------------------------------------ ICONS ------------------------------------
+
+Most icons have been nicked from GNOME and the GIMP, both under GPL. 
+Some are originally LGPL but redistributed here under GPL. 
+
+The keyboard icon comes fom:
+- source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
+- licence: GPL
+- designer: Paolino, http://www.paolinoland.it/
+- original filename: keyboard.png
+- original size: 128x128
+- modifications: icon was cropped, then resized

README

@@ -16,7 +16,7 @@ How to get Java Runtime Environment
 -----------------------------------
 You need JRE Version 7, or later.
 
-Microsoft Windows and Apple Mac OS X users should visit http://www.java.com
+Microsoft Windows and Apple Mac OS X users should visit https://www.java.com
 and download the latest Java executable for their system.
 
 Linux users should visit http://www.oracle.com/technetwork/java/index.html
@@ -58,14 +58,17 @@ This is an overview of the files and directories in the JOSM code repository:
 - build.xml                 ant build file (standard way to create a JOSM binary)
 - CONTRIBUTION              list of major code contributors
 - data/                     data files that will be included in the JOSM jar file
-    - *.gsb                 NTv2 grid files for projection support
+    - fonts/                font files used for map rendering
+    - projection/           projection files
+      - *.gsb               NTv2 grid files for projection support
+      - epsg                list of projection definitions
     - *.lang                translation data
     - *.xsd                 xml schema files for validation of configuration files
-    - epsg                  list of projection definitions
     - help-browser.css      CSS file for the help sites (HTML content is downloaded from the website
                             on demand, but displayed inside the programm in a Java web browser component.)
-    - ignoretags.cfg, tagchecker.cfg
-                            data files used by the JOSM validator feature
+    - validator/            data files used by the JOSM validator feature
+      - *.cfg               files designed for the old tagchecker, still used
+      - *.mapcss            default validation rules for the new mapcss-based tagchecker
 - data_nodist/              data files that are useful for development, but not distributed
     - exif-direction-example.jpg
                             sample image, that contains direction information in the EXIF header
@@ -87,14 +90,18 @@ This is an overview of the files and directories in the JOSM code repository:
     - styles/standard       images for the main map style (external repository)
 - images_nodist/            images, which are not for distribution, but may be useful later (e.g. high
                             resolution and vector versions)
-- josm.jnlp                 Java Web Start launcher file (used on the website)
-- lib/                      libraries (directory is empty at the moment)
+- josm.jnlp                 Java Web Start launcher file (used on the website for the tested version)
+- josm-latest.jnlp          Java Web Start launcher file (used on the website for the latest version)
 - LICENSE                   the JOSM license terms
-- macosx/                   files needed to create the MacOS package
+- linux/                    files useful for Linux distributions, including Appdata files, .desktop
+                            files, Debian/Ubuntu scripts, man pages, icons, etc.
+- macosx/                   files needed to create the MacOS X package
 - netbeans/                 preconfigured Netbeans project
 - optimize-images           short script to decrease size of PNG images
 - patches/                  patches for external libraries used in JOSM (see below)
 - README                    this file
+- resources/                resource files that will be included in the JOSM jar file
+- scripts/                  various scripts used by JOSM developers
 - src/                      the source code of the program
 - start.html                HTML page to run the applet version of JOSM
 - styles/                   map styles included in JOSM
@@ -107,15 +114,18 @@ This is an overview of the files and directories in the JOSM code repository:
     - performance/          performance tests (source code)
     - unit/                 unit tests (source code)
 - tools/                    libraries and tools that help in the development process
-    - animal-sniffer-ant-tasks-1.8.jar
-                            TODO: what is this?
+    - animal-sniffer-ant-tasks-1.13.jar
+                            used to build and check code signatures to ensure plugins binary compatibility 
     - appbundler-1.0ea.jar  used to build Mac OS X package for Oracle Java 7
     - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential
                             problems in source code); can be launched as an ant target in build.xml
+    - groovy-all-2.3.9.jar  used for some unit tests and various scripts
     - jacocoant.jar         used to include coverage data into JUnit test reports 
     - javacc.jar            used in the build process to generate some .java files from a javacc source file
                             (src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj)
     - proguard.jar          optimize final binary jar - see build.xml (not used in production so far)
+    - xmltask.jar           used to edit XML files from Ant for the OSX package
+- windows/                  files needed to create the Windows installer
 
 The 'patches' directory
 -----------------------
@@ -132,34 +142,35 @@ Of course, it is also possible to apply the patch files manually one by one.
 
 Third party libraries
 ---------------------
-There are a couple of third party libraries which are directly included in the source code tree, in particular:
+There are some third party libraries which are directly included in the source code tree, in particular:
 
 * jmapviewer: Java component to browse a TMS map
     src/org/openstreetmap/gui (svn external)
     -> http://svn.openstreetmap.org/applications/viewer/jmapviewer/
-* Apache Ant's bzip2: Support for bzip2 compression when opening files
-    src/org/apache/tools/bzip2 (svn external)
-    -> http://svn.apache.org/repos/asf/ant/core/trunk/src/main/org/apache/tools/bzip2
 * Apache commons codec: Better Base64 support
     src/org/apache/commons/codec (svn external)
     -> http://svn.apache.org/repos/asf/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec
+* Apache commons compress: Support for bzip2 compression when opening files
+    src/org/apache/commons/compress/compressors (svn external)
+    -> http://svn.apache.org/repos/asf/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors
+* Apache commons validator: Improved validator routines
+    src/org/openstreetmap/josm/data/validation/routines
+    -> http://commons.apache.org/proper/commons-validator
 * SVG Salamander: Support for SVG image format
     src/com/kitfox/svg
-    -> http://svgsalamander.java.net/
+    -> https://svgsalamander.java.net/
 * Metadata Extractor: Read EXIF Metadata of photos
     src/com/drew
-    -> http://www.drewnoakes.com/code/exif/
+    -> https://www.drewnoakes.com/code/exif/
 * Signpost: OAuth library
     src/oauth, src/com/google
-    -> http://code.google.com/p/oauth-signpost/
+    -> https://code.google.com/p/oauth-signpost/
 * GNU getopt Java port: Command line argument processing library
     src/gnu/getopt
-    -> http://www.urbanophile.com/~arenn/hacking/download.html
+    -> http://www.urbanophile.com/arenn/hacking/download.html
 * MultiSplitPane: Small lib for GUI layout management
     src/org/openstreetmap/josm/gui/MultiSplitLayout.java, MultiSplitPane.java
     -> http://today.java.net/pub/a/today/2006/03/23/multi-split-pane.html
 * swinghelper: Class CheckThreadViolationRepaintManager to find classpath violations
     src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java
-    -> http://java.net/projects/swinghelper
-
-
+    -> https://java.net/projects/swinghelper