From c10d96b43cc6882c993fb2db7c24e3bc82f96855 Mon Sep 17 00:00:00 2001
From: Ilia Motornyi <elmot@vaadin.com>
Date: Mon, 13 Aug 2018 09:40:41 +0300
Subject: [PATCH] Set correct GWT .dtd definition (#11110)

---
 client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml | 2 +-
 client/src/main/resources/com/vaadin/Vaadin.gwt.xml           | 2 +-
 .../src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml | 2 +-
 documentation/clientside/clientside-module.asciidoc           | 4 ++--
 .../com/vaadin/server/widgetsetutils/WidgetSetBuilder.java    | 2 +-
 .../addonusingownwidgetset/AddonUsingOwnWidgetSet.gwt.xml     | 2 +-
 .../com/vaadin/test/ownwidgetset/OwnWidgetSet.gwt.xml         | 2 +-
 .../com/vaadin/test/spaceindirectory/SpaceInDirectory.gwt.xml | 2 +-
 .../VaadinServletConfigurationWidgetSet.gwt.xml               | 2 +-
 .../com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml       | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml b/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml
index 393e67b238..bf92370b33 100755
--- a/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml
+++ b/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN" "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 <module>
     <!-- This GWT module defines the Vaadin DefaultWidgetSet. This is the module
         you want to extend when creating an extended widget set, or when creating
diff --git a/client/src/main/resources/com/vaadin/Vaadin.gwt.xml b/client/src/main/resources/com/vaadin/Vaadin.gwt.xml
index 347530db2c..39fe3827a6 100644
--- a/client/src/main/resources/com/vaadin/Vaadin.gwt.xml
+++ b/client/src/main/resources/com/vaadin/Vaadin.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN" "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 <module>
     <!-- This GWT module inherits all Vaadin client side functionality modules.
         This is the module you want to inherit in your client side project to be
diff --git a/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml b/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml
index 548fd27c53..d941c38633 100755
--- a/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml
+++ b/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN" "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 <module>
     <!-- Hint for WidgetSetBuilder not to automatically update the file -->
     <!-- WS Compiler: manually edited -->
diff --git a/documentation/clientside/clientside-module.asciidoc b/documentation/clientside/clientside-module.asciidoc
index f7476dbe5b..63da2d647b 100644
--- a/documentation/clientside/clientside-module.asciidoc
+++ b/documentation/clientside/clientside-module.asciidoc
@@ -20,8 +20,8 @@ widget set, you should normally inherit the [classname]#DefaultWidgetSet#.
 
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC
-  "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN"
-  "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
+  "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN"
+  "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 
 <module>
     <!-- Inherit the default widget set -->
diff --git a/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java b/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
index a45d5030a7..03b26d22d0 100644
--- a/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
+++ b/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
@@ -87,7 +87,7 @@ public class WidgetSetBuilder {
             try (PrintStream printStream = new PrintStream(
                     new FileOutputStream(widgetsetFile))) {
                 printStream.print("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                        + "<!DOCTYPE module PUBLIC \"-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN\" \"http://gwtproject.org/doctype/2.8.1/gwt-module.dtd\">\n");
+                        + "<!DOCTYPE module PUBLIC \"-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN\" \"http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd\">\n");
                 printStream.print("<module>\n");
                 printStream.print("    <!--\n"
                         + "     Uncomment the following to compile the widgetset for one browser only.\n\n"
diff --git a/test/addon-using-own-widget-set/src/main/resources/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSet.gwt.xml b/test/addon-using-own-widget-set/src/main/resources/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSet.gwt.xml
index 34c3a6f78e..7197f453c7 100644
--- a/test/addon-using-own-widget-set/src/main/resources/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSet.gwt.xml
+++ b/test/addon-using-own-widget-set/src/main/resources/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSet.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN" "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 <module>
     <inherits name="com.vaadin.DefaultWidgetSet" />
 
diff --git a/test/own-widget-set/src/main/resources/com/vaadin/test/ownwidgetset/OwnWidgetSet.gwt.xml b/test/own-widget-set/src/main/resources/com/vaadin/test/ownwidgetset/OwnWidgetSet.gwt.xml
index 6464b33b5e..e7a4cc17dc 100644
--- a/test/own-widget-set/src/main/resources/com/vaadin/test/ownwidgetset/OwnWidgetSet.gwt.xml
+++ b/test/own-widget-set/src/main/resources/com/vaadin/test/ownwidgetset/OwnWidgetSet.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN" "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 <module>
     <inherits name="com.vaadin.DefaultWidgetSet" />
 </module>
diff --git a/test/space in directory/src/main/resources/com/vaadin/test/spaceindirectory/SpaceInDirectory.gwt.xml b/test/space in directory/src/main/resources/com/vaadin/test/spaceindirectory/SpaceInDirectory.gwt.xml
index d5f502563c..b972694a3b 100644
--- a/test/space in directory/src/main/resources/com/vaadin/test/spaceindirectory/SpaceInDirectory.gwt.xml	
+++ b/test/space in directory/src/main/resources/com/vaadin/test/spaceindirectory/SpaceInDirectory.gwt.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN" "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 <module>
     <inherits name="com.vaadin.DefaultWidgetSet" />
 </module>
\ No newline at end of file
diff --git a/test/vaadinservletconfiguration-widget-set/src/main/resources/com/vaadin/test/vaadinservletconfigurationwidgetset/VaadinServletConfigurationWidgetSet.gwt.xml b/test/vaadinservletconfiguration-widget-set/src/main/resources/com/vaadin/test/vaadinservletconfigurationwidgetset/VaadinServletConfigurationWidgetSet.gwt.xml
index d5f502563c..b972694a3b 100644
--- a/test/vaadinservletconfiguration-widget-set/src/main/resources/com/vaadin/test/vaadinservletconfigurationwidgetset/VaadinServletConfigurationWidgetSet.gwt.xml
+++ b/test/vaadinservletconfiguration-widget-set/src/main/resources/com/vaadin/test/vaadinservletconfigurationwidgetset/VaadinServletConfigurationWidgetSet.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN" "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 <module>
     <inherits name="com.vaadin.DefaultWidgetSet" />
 </module>
\ No newline at end of file
diff --git a/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
index 60103c1ff5..4a70b40dec 100644
--- a/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
+++ b/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.1//EN" "http://gwtproject.org/doctype/2.8.1/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN" "http://www.gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 <module>
     <!-- WS Compiler: manually edited -->
 
-- 
2.39.5