REVISION

 <?xml version="1.0" encoding="UTF-8"?>
 <info>
 <entry
-   kind="dir"
    path="trunk"
-   revision="15155">
+   revision="15234"
+   kind="dir">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
 <repository>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="15155">
+   revision="15234">
 <author>Don-vip</author>
-<date>2019-06-02T22:05:30.873405Z</date>
+<date>2019-07-07T23:14:04.312605Z</date>
 </commit>
 </entry>
 </info>

build.xml

@@ -726,6 +726,10 @@ Build-Date: ${build.tstamp}
                     <!-- Skip javafx on Java 8/9, built for Java 10+ only -->
                     <regexp pattern="javafx.*"/>
                 </linecontainsregexp>
+                <linecontainsregexp negate="true" unless:set="isJava11">
+                    <!-- Skip http2 on Java 8/9/10, built for Java 11+ only -->
+                    <regexp pattern="http2.*"/>
+                </linecontainsregexp>
                 <tokenfilter>
                     <replaceregex pattern="^.*;" replace="" flags="gi"/>
                 </tokenfilter>

data/validator/combinations.mapcss

@@ -117,6 +117,7 @@ way[waterway=pressurised       ][tunnel!=flooded][man_made!=pipeline] {
 }
 
 /* {0.tag} without {1.key} (warning level) */
+node[traffic_sign=maxspeed][!maxspeed],
 node[actuator=manual][!handle],
 node[emergency=fire_hydrant][!fire_hydrant:type],
 way[     boundary=administrative][!admin_level],
@@ -377,7 +378,7 @@ way[highway=footway][cycleway=lane] {
 *[bridge  ][!highway][!railway][!waterway][!piste:type][public_transport!=platform][route!=ferry][man_made!=pipeline][man_made!=goods_conveyor][man_made!=wildlife_crossing][man_made!=bridge][building!=bridge],
 *[psv     ][!highway][!railway][!waterway][barrier!=bollard][amenity !~ /^parking.*/],
 *[width   ][!highway][!railway][!waterway][!aeroway][!cycleway][!footway][!barrier][!man_made][!entrance][natural!=stone][leisure!=track],
-*[maxspeed][!highway][!railway][traffic_sign !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][type != enforcement][waterway !~ /^(river|canal|lock)$/][!traffic_calming][aerialway!=zip_line] {
+*[maxspeed][!highway][!railway][traffic_sign !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][traffic_sign:forward !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][traffic_sign:backward !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][type != enforcement][waterway !~ /^(river|canal|lock)$/][!traffic_calming][aerialway!=zip_line] {
   throwWarning: tr("{0} on suspicious object", "{0.key}");
   group: tr("suspicious tag combination");
 }
@@ -591,3 +592,9 @@ way:areaStyle[highway][highway =~ /motorway|trunk|primary|secondary|tertiary|unc
   throwOther: tr("A linear object {0} without {1} has a tag indicating that it is an area.", "{1.tag}", "{3.tag}");
   group: tr("suspicious tag combination");
 }
+
+/* #17804 */
+area[cemetery=sector][landuse=cemetery] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("suspicious tag combination");
+}
\ No newline at end of file

data/validator/deprecated.mapcss

@@ -1442,3 +1442,34 @@ way[/^is_in:.*$/] {
   suggestAlternative: "designation=common";
   group: tr("deprecated tagging");
 }
+
+/* #17043 */
+*[cuisine=vegan],
+*[cuisine=vegetarian] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: concat("diet:", "{0.value}", "=yes");
+  suggestAlternative: concat("diet:", "{0.value}", "=only");
+  group: tr("deprecated tagging");
+}
+
+/* #17798 */
+*[kitchen_hours] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "opening_hours:kitchen";
+  fixChangeKey: "kitchen_hours => opening_hours:kitchen";
+  group: tr("deprecated tagging");
+}
+
+/* #17681 */
+*[shop=money_transfer] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=money_transfer";
+  fixChangeKey: "shop => amenity";
+  group: tr("deprecated tagging");
+}
+
+*[contact:google_plus] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  fixRemove: "contact:google_plus";
+  group: tr("deprecated tagging");
+}
\ No newline at end of file

data/validator/ignoretags.cfg

@@ -182,6 +182,7 @@ K:building=static_caravan
 K:building=semi
 K:building=semidetached_house
 K:building=slurry_tank
+K:building=trullo
 K:leisure=recreation_ground
 E:old_railway_operator
 K:maintenance=gritting
@@ -368,8 +369,9 @@ K:sport=skating
 K:surface=hard
 ;
 ; Tags not yet decided (to remove from this section when added or deprecated) 
-; see josm tickets: 10759 15309 15774 16315 16658 16793
+; see josm tickets: 17770 10759 15309 15774 16315 16658 16793
 ;
+K:service=irrigation
 K:man_made=mast
 K:amenity=childcare
 K:landuse=logging

debian/changelog

+josm (0.0.svn15234+dfsg-1) unstable; urgency=medium
+
+  * New tested snapshot.
+  * Update copyright years for Drew Noakes and contributors.
+  * Refresh patches.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 08 Jul 2019 06:10:42 +0200
+
 josm (0.0.svn15155+dfsg-1) unstable; urgency=medium
 
   * Move from experimental to unstable.

debian/copyright

@@ -81,7 +81,7 @@ Copyright: JOSM developers
 License: CC-BY-SA-3.0
 
 Files: src/com/drew/*
-Copyright: 2002-2017, Drew Noakes
+Copyright: 2002-2019, Drew Noakes and contributors
            2002-2011, Andreas Ziermann
 License: Apache-2.0
 

debian/patches/00-build.patch

@@ -197,7 +197,7 @@ Forwarded: not-needed
      </target>
      <macrodef name="init-test-preferences">
          <attribute name="testfamily"/>
-@@ -1021,6 +1004,7 @@ Build-Date: ${build.tstamp}
+@@ -1025,6 +1008,7 @@ Build-Date: ${build.tstamp}
                  <pathelement path="${base.dir}"/>
                  <pathelement path="${proj-classpath}"/>
                  <pathelement path="${proj-build.dir}"/>

debian/patches/01-bts.patch

@@ -56,7 +56,7 @@ Forwarded: not-needed
  import org.openstreetmap.josm.tools.PlatformHookUnixoid;
  import org.openstreetmap.josm.tools.PlatformManager;
  import org.openstreetmap.josm.tools.Shortcut;
-@@ -305,7 +306,7 @@ public final class ShowStatusReportActio
+@@ -321,7 +322,7 @@ public final class ShowStatusReportActio
  
          switch (ed.showDialog().getValue()) {
              case 1: ta.copyToClipboard(); break;