Index: /trunk/.checkstyle
===================================================================
--- /trunk/.checkstyle	(revision 14416)
+++ /trunk/.checkstyle	(revision 14417)
@@ -11,5 +11,4 @@
   <filter name="FilesFromPackage" enabled="true">
     <filter-data value="src/com"/>
-    <filter-data value="src/gnu"/>
     <filter-data value="src/javax"/>
     <filter-data value="src/oauth"/>
Index: /trunk/README
===================================================================
--- /trunk/README	(revision 14416)
+++ /trunk/README	(revision 14417)
@@ -204,7 +204,4 @@
     src/oauth, src/com/google
     -> https://github.com/mttkay/signpost
-* GNU getopt Java port: Command line argument processing library
-    src/gnu/getopt
-    -> https://github.com/arenn/java-getopt
 * MultiSplitPane: Small lib for GUI layout management
     src/org/openstreetmap/josm/gui/MultiSplitLayout.java, MultiSplitPane.java
Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 14416)
+++ /trunk/build.xml	(revision 14417)
@@ -274,5 +274,5 @@
     <target name="compile-cots" depends="init">
         <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
+        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**" nowarn="on" encoding="iso-8859-1"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
             <!-- get rid of "internal proprietary API" warning -->
@@ -329,5 +329,5 @@
         <!-- JMapViewer -->
         <javac sourcepath="" srcdir="${src.dir}" fork="yes"
-            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**,gnu/**"
+            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
@@ -355,5 +355,5 @@
         <!-- JOSM -->
         <javac sourcepath="" srcdir="${src.dir}" fork="yes"
-            excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
+            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
@@ -1007,5 +1007,5 @@
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-tools.jar" includes="org/openstreetmap/josm/tools/**/*.class"/>
         <exec executable="jdeps" dir="${modules.dir}">
-            <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|gnu.*|oauth.*|org.apache.*|org.glassfish.*|org.jdesktop.*|org.openstreetmap.gui.*'"/>
+            <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|oauth.*|org.apache.*|org.glassfish.*|org.jdesktop.*|org.openstreetmap.gui.*'"/>
             <arg line="-dotoutput dots *.jar"/>
         </exec>
@@ -1017,5 +1017,4 @@
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/metadata-extractor.jar" includes="com/drew/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/svgSalamander.jar" includes="com/kitfox/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/gnu-getopt.jar" includes="gnu/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/javax-json.jar" includes="javax/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/oauth-signpost.jar" includes="oauth/**/*.class"/>
Index: unk/patches/30gettext_i18n.patch
===================================================================
--- /trunk/patches/30gettext_i18n.patch	(revision 14416)
+++ 	(revision )
@@ -1,88 +1,0 @@
-Some translations come with gnu getopt, but we support more languages. Therefore this patch switches to the normal JOSM I18n framework.
-Index: core/src/gnu/getopt/Getopt.java
-===================================================================
---- core.orig/src/gnu/getopt/Getopt.java	2012-06-18 01:11:14.320660615 +0200
-+++ core/src/gnu/getopt/Getopt.java	2012-06-18 01:12:02.516661865 +0200
-@@ -22,11 +22,9 @@
- 
- package gnu.getopt;
- 
--import static org.openstreetmap.josm.tools.I18n.tr;
--
-+import java.util.Locale;
-+import java.util.ResourceBundle;
- import java.text.MessageFormat;
--import java.util.HashMap;
--import java.util.Map;
- 
- /**************************************************************************/
- 
-@@ -541,7 +539,8 @@
- /**
-   * The localized strings are kept in a separate file
-   */
--private OptI18n _messages = new OptI18n(); // ResourceBundle.getBundle("gnu/getopt/MessagesBundle", Locale.getDefault());
-+private ResourceBundle _messages = ResourceBundle.getBundle(
-+                           "gnu/getopt/MessagesBundle", Locale.getDefault());
- 
- /**************************************************************************/
- 
-@@ -583,33 +582,6 @@
- 
- /**************************************************************************/
- 
--static class OptI18n {
--    public  OptI18n() {
--        add("getopt.ambigious", tr("{0}: option ''{1}'' is ambiguous"));
--        add("getopt.arguments1", tr("{0}: option ''--{1}'' does not allow an argument"));
--        add("getopt.arguments2", tr("{0}: option ''{1}{2}'' does not allow an argument"));
--        add("getopt.requires", tr("{0}: option ''{1}'' requires an argument"));
--        add("getopt.unrecognized", tr("{0}: unrecognized option ''--{1}''"));
--        add("getopt.unrecognized2", tr("{0}: unrecognized option ''{1}{2}''"));
--        add("getopt.illegal", tr("{0}: illegal option -- {1}"));
--        add("getopt.invalid", tr("{0}: invalid option -- {1}"));
--        add("getopt.requires2", tr("{0}: option requires an argument -- {1}"));
--        add("getopt.invalidValue", tr("Invalid value {0} for parameter ''has_arg''"));
--    }
--
--    Map<String, String> trns = new HashMap<String, String>();
--
--    private void add(String key, String value) {
--        trns.put(key, value);
--    }
--
--    public String getString(String s) {
--        String val = trns.get(s);
--        if (val == null) throw new IllegalArgumentException();
--        return val.replace("'", "''");
--    }
--}
--
- /**
-   * Construct a Getopt instance with given input data that is capable of
-   * parsing long options and short options.  Contrary to what you might
-@@ -646,8 +618,8 @@
-   else
-     {
-       posixly_correct = true;
--      _messages = new OptI18n();//ResourceBundle.getBundle("gnu/getopt/MessagesBundle",
--                             //                      Locale.US);
-+      _messages = ResourceBundle.getBundle("gnu/getopt/MessagesBundle",
-+                                                   Locale.US);
-     }
- 
-   // Determine how to handle the ordering of options and non-options
-Index: core/src/gnu/getopt/LongOpt.java
-===================================================================
---- core.orig/src/gnu/getopt/LongOpt.java	2012-06-18 01:11:14.400660615 +0200
-+++ core/src/gnu/getopt/LongOpt.java	2012-06-18 01:12:02.524661863 +0200
-@@ -99,7 +99,8 @@
- /**
-   * Localized strings for error messages
-   */
--private Getopt.OptI18n _messages = new Getopt.OptI18n(); // ResourceBundle.getBundle("gnu/getopt/MessagesBundle", Locale.getDefault());
-+private ResourceBundle _messages = ResourceBundle.getBundle(
-+                            "gnu/getopt/MessagesBundle", Locale.getDefault());
- 
- /**************************************************************************/
- 
Index: /trunk/patches/series
===================================================================
--- /trunk/patches/series	(revision 14416)
+++ /trunk/patches/series	(revision 14417)
@@ -1,2 +1,1 @@
 10trim_svgsalamander.patch
-30gettext_i18n.patch
Index: /trunk/tools/spotbugs/josm-filter.xml
===================================================================
--- /trunk/tools/spotbugs/josm-filter.xml	(revision 14416)
+++ /trunk/tools/spotbugs/josm-filter.xml	(revision 14417)
@@ -52,7 +52,4 @@
     </Match>
     <Match>
-        <Class name="~gnu.getopt.*" />
-    </Match>
-    <Match>
         <Class name="~javax.json.*" />
     </Match>