Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 10745)
+++ /trunk/build.xml	(revision 10746)
@@ -403,8 +403,6 @@
                 <junit printsummary="yes" fork="true" forkmode="once">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
-                    <jvmarg line="-addmods java.xml.bind" if:set="isJava9" />
                     <jvmarg value="-XaddExports:java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
                     <jvmarg value="-XaddExports:java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
-                    <jvmarg value="-XaddExports:java.xml.bind/javax.xml.bind=ALL-UNNAMED" if:set="isJava9" />
                     <sysproperty key="josm.home" value="${test.dir}/config/@{testfamily}-josm.home"/>
                     <sysproperty key="josm.test.data" value="${test.dir}/data"/>
Index: /trunk/src/com/kitfox/svg/SVGUniverse.java
===================================================================
--- /trunk/src/com/kitfox/svg/SVGUniverse.java	(revision 10745)
+++ /trunk/src/com/kitfox/svg/SVGUniverse.java	(revision 10746)
@@ -56,4 +56,5 @@
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -62,5 +63,4 @@
 import java.util.zip.GZIPInputStream;
 import javax.imageio.ImageIO;
-import javax.xml.bind.DatatypeConverter;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
@@ -195,5 +195,5 @@
                 try
                 {
-                    byte[] buf = DatatypeConverter.parseBase64Binary(content.substring(6));
+                    byte[] buf = Base64.getDecoder().decode(content.substring(6));
                     ByteArrayInputStream bais = new ByteArrayInputStream(buf);
                     BufferedImage img = ImageIO.read(bais);
Index: /trunk/src/com/kitfox/svg/app/data/Handler.java
===================================================================
--- /trunk/src/com/kitfox/svg/app/data/Handler.java	(revision 10745)
+++ /trunk/src/com/kitfox/svg/app/data/Handler.java	(revision 10746)
@@ -42,8 +42,7 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
+import java.util.Base64;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
-import javax.xml.bind.DatatypeConverter;
 
 /**
@@ -71,5 +70,5 @@
                 try
                 {
-                    buf = DatatypeConverter.parseBase64Binary(content.substring(7));
+                    buf = Base64.getDecoder().decode(content.substring(7));
                 }
                 catch (IllegalArgumentException e)
Index: /trunk/src/oauth/signpost/signature/OAuthMessageSigner.java
===================================================================
--- /trunk/src/oauth/signpost/signature/OAuthMessageSigner.java	(revision 10745)
+++ /trunk/src/oauth/signpost/signature/OAuthMessageSigner.java	(revision 10746)
@@ -17,5 +17,5 @@
 import java.io.IOException;
 import java.io.Serializable;
-import javax.xml.bind.DatatypeConverter;
+import java.util.Base64;
 
 import oauth.signpost.exception.OAuthMessageSignerException;
@@ -54,9 +54,9 @@
 
     protected byte[] decodeBase64(String s) {
-        return DatatypeConverter.parseBase64Binary(s);
+        return Base64.getDecoder().decode(s);
     }
 
     protected String base64Encode(byte[] b) {
-        return DatatypeConverter.printBase64Binary(b);
+        return Base64.getEncoder().encodeToString(b);
     }
 
Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 10745)
+++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 10746)
@@ -32,4 +32,5 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.HashMap;
@@ -55,5 +56,4 @@
 import javax.imageio.stream.ImageInputStream;
 import javax.swing.ImageIcon;
-import javax.xml.bind.DatatypeConverter;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -951,5 +951,5 @@
             byte[] bytes;
             if (";base64".equals(base64)) {
-                bytes = DatatypeConverter.parseBase64Binary(data);
+                bytes = Base64.getDecoder().decode(data);
             } else {
                 try {