diff options
| -rw-r--r-- | all/src/main/templates/release-notes.html | 1 | ||||
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | server/pom.xml | 2 | ||||
| -rw-r--r-- | server/src/main/java/com/vaadin/server/BootstrapHandler.java | 12 | ||||
| -rw-r--r-- | shared/pom.xml | 8 | ||||
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java | 3 |
6 files changed, 15 insertions, 12 deletions
diff --git a/all/src/main/templates/release-notes.html b/all/src/main/templates/release-notes.html index 77cce634f4..437b0d5d00 100644 --- a/all/src/main/templates/release-notes.html +++ b/all/src/main/templates/release-notes.html @@ -113,6 +113,7 @@ <li>Vaadin artifacts no longer bring a transitive dependency to javax.servlet:servlet-api.</li> <li>System properties now override application parameters for settings such as production mode (see above).</li> <li>The return type of BootstrapHandler.getWidgetsetForUI() has changed.</li> + <li>Vaadin shared no longer depends on a custom build of Guava. Any project that depends on Guava as a transitive dependency should use standard Guava.</li> </ul> <h3 id="knownissues">Known Issues and Limitations</h3> <ul> @@ -25,7 +25,6 @@ <!-- Used version numbers for dependencies --> <commons-io.version>2.4</commons-io.version> <google.appengine.version>1.7.7</google.appengine.version> - <guava.version>16.0.1.vaadin1</guava.version> <jsoup.version>1.8.3</jsoup.version> <liferay.portal.version>6.0.2</liferay.portal.version> diff --git a/server/pom.xml b/server/pom.xml index 92ed9c2713..6ea5ab87fc 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -273,7 +273,7 @@ javax.portlet;version="[${javax.portlet.version},3)";resolution:=optional, javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional, com.liferay.portal.kernel.util;resolution:=optional</Import-Package> - <Require-Bundle>com.google.gwt.thirdparty.guava;bundle-version="${guava.version}", + <Require-Bundle> com.vaadin.shared;bundle-version="${project.version}", com.vaadin.push;bundle-version="${project.version}";resolution:=optional, com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional"</Require-Bundle> diff --git a/server/src/main/java/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java index d3a988bea3..c139d5443c 100644 --- a/server/src/main/java/com/vaadin/server/BootstrapHandler.java +++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java @@ -20,6 +20,8 @@ import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -37,7 +39,6 @@ import org.jsoup.nodes.Element; import org.jsoup.nodes.Node; import org.jsoup.parser.Tag; -import com.google.gwt.thirdparty.guava.common.net.UrlEscapers; import com.vaadin.annotations.JavaScript; import com.vaadin.annotations.StyleSheet; import com.vaadin.annotations.Viewport; @@ -227,7 +228,14 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { @Override protected String encodeQueryStringParameterValue(String queryString) { - return UrlEscapers.urlFormParameterEscaper().escape(queryString); + String encodedString = null; + try { + encodedString = URLEncoder.encode(queryString, "UTF-8"); + } catch (UnsupportedEncodingException e) { + // should never happen + throw new RuntimeException("Could not find UTF-8", e); + } + return encodedString; } } diff --git a/shared/pom.xml b/shared/pom.xml index 8706e45f70..b94cfd7475 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -31,11 +31,7 @@ <artifactId>streamhtmlparser-jsilver</artifactId> <version>${streamhtmlparser.version}</version> </dependency> - <dependency> - <groupId>com.vaadin.external.google</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> + <!-- Needed GWT dependencies. Required parts are packaged to jar --> <dependency> @@ -156,7 +152,7 @@ org.w3c.flute.parser;version="${flute.version}", org.w3c.flute.parser.selectors;version="${flute.version}", org.w3c.flute.util;version="${flute.version}"</Import-Package> - <Require-Bundle>com.google.gwt.thirdparty.guava;bundle-version="${guava.version}"</Require-Bundle> + <Require-Bundle></Require-Bundle> </instructions> </configuration> <executions> diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java index a9fea9408b..7029abd9ac 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -59,7 +59,6 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import com.google.gwt.thirdparty.guava.common.base.Joiner; import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium; import com.vaadin.server.LegacyApplication; import com.vaadin.server.UIProvider; @@ -279,7 +278,7 @@ public abstract class AbstractTB3Test extends ParallelTest { } if (parameters.size() > 0) { - url += "?" + Joiner.on("&").join(parameters); + url += "?" + StringUtils.join(parameters, "&"); } driver.get(url); |