Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 16628)
+++ /trunk/build.xml	(revision 16629)
@@ -302,5 +302,5 @@
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
-            <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:UndefinedEquals:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:BadImport:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF"/>
+            <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:UndefinedEquals:OFF -Xep:BadImport:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <classpath>
Index: /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 16628)
+++ /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 16629)
@@ -98,5 +98,5 @@
         try {
             if (info.getUrl() != null && info.getUrl().contains("{time}")) {
-                final String instant = Year.now().atDay(1).atStartOfDay(ZoneOffset.UTC).toInstant().toString();
+                final String instant = Year.now(ZoneOffset.UTC).atDay(1).atStartOfDay(ZoneOffset.UTC).toInstant().toString();
                 final String example = String.join("/", instant, instant);
                 final String initialSelectionValue = info.getDate() != null ? info.getDate() : example;
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/DateValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/DateValidator.java	(revision 16628)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/DateValidator.java	(revision 16629)
@@ -5,4 +5,5 @@
 
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -59,5 +60,5 @@
      */
     public String getStandardTooltipText() {
-        final ZonedDateTime now = ZonedDateTime.now();
+        final ZonedDateTime now = ZonedDateTime.now(ZoneId.systemDefault());
         return tr(
                 "Please enter a date in the usual format for your locale.<br>"
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeValidator.java	(revision 16628)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeValidator.java	(revision 16629)
@@ -5,4 +5,5 @@
 
 import java.time.LocalTime;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -61,5 +62,5 @@
      */
     public String getStandardTooltipText() {
-        final ZonedDateTime now = ZonedDateTime.now();
+        final ZonedDateTime now = ZonedDateTime.now(ZoneId.systemDefault());
         return tr(
                 "Please enter a valid time in the usual format for your locale.<br>"
Index: /trunk/src/org/openstreetmap/josm/gui/download/UserQueryList.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/UserQueryList.java	(revision 16628)
+++ /trunk/src/org/openstreetmap/josm/gui/download/UserQueryList.java	(revision 16629)
@@ -15,4 +15,5 @@
 import java.awt.event.MouseEvent;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -136,5 +137,5 @@
         if (!historicExist) {
             SelectorItem item = new SelectorItem(
-                    TRANSLATED_HISTORY + " " + LocalDateTime.now().format(FORMAT), query);
+                    TRANSLATED_HISTORY + " " + LocalDateTime.now(ZoneId.systemDefault()).format(FORMAT), query);
 
             this.items.put(item.getKey(), item);
@@ -540,5 +541,5 @@
                             this.query.getText(),
                             !newKey.equals(itemKey) || !newQuery.equals(itemQuery)
-                                ? LocalDateTime.now()
+                                ? LocalDateTime.now(ZoneId.systemDefault())
                                 : this.itemToEdit.getLastEdit()));
 
@@ -571,5 +572,5 @@
          */
         public SelectorItem(String key, String query) {
-            this(key, query, LocalDateTime.now());
+            this(key, query, LocalDateTime.now(ZoneId.systemDefault()));
         }
 
Index: /trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java	(revision 16628)
+++ /trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java	(revision 16629)
@@ -13,4 +13,5 @@
 import java.text.MessageFormat;
 import java.time.Year;
+import java.time.ZoneId;
 import java.util.Optional;
 
@@ -291,5 +292,5 @@
             if (copyrightYear.getText().isEmpty()) {
                 copyrightYear.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_YEAR)).orElseGet(
-                        () -> Year.now().toString()));
+                        () -> Year.now(ZoneId.systemDefault()).toString()));
             }
             if (copyright.getText().isEmpty()) {
Index: /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 16628)
+++ /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 16629)
@@ -10,4 +10,5 @@
 import java.time.LocalDateTime;
 import java.time.Period;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.Arrays;
@@ -205,5 +206,5 @@
                 switch (matcher.group(1)) {
                     case "date":
-                        matcher.appendReplacement(sb, date(matcher.group(2), LocalDateTime.now()));
+                        matcher.appendReplacement(sb, date(matcher.group(2), LocalDateTime.now(ZoneId.systemDefault())));
                         break;
                     case "geocodeArea":