Author: lindner
Date: Tue Aug 26 00:53:36 2014
New Revision: 1620491
URL: http://svn.apache.org/r1620491
Log:
update shindig deps
Modified:
shindig/trunk/UPGRADING
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
shindig/trunk/pom.xml
Modified: shindig/trunk/UPGRADING
URL:
http://svn.apache.org/viewvc/shindig/trunk/UPGRADING?rev=1620491&r1=1620490&r2=1620491&view=diff
==============================================================================
--- shindig/trunk/UPGRADING (original)
+++ shindig/trunk/UPGRADING Tue Aug 26 00:53:36 2014
@@ -1,3 +1,24 @@
+
+2.5.2
+=====
+
+== Java Dependency Changes ==
+
+Updates
+* commons-codec 1.7 -> 1.9
+* commons-lang3 3.1 -> 3.3.2
+* joda-time 2.1 -> 2.4
+* icu4j 4.8.1.1 -> 53.1
+* xstream 1.4.3 -> 1.4.7
+* nekohtml 1.9.17 -> 1.9.21
+* el-api 6.0.36 -> 6.0.41
+* juel-impl 2.2.5 -> 2.2.7
+* xml-apis 1.3.04 -> 1.4.01
+* httpclient 4.1.2 -> 4.3.5
+* slf4j-jdk14 1.6.1 -> 1.7.7
+* guava 14.0.1 -> 17.0
+
+
FROM 2.0.x TO 2.5.x
===================
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java?rev=1620491&r1=1620490&r2=1620491&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
Tue Aug 26 00:53:36 2014
@@ -50,9 +50,9 @@ import org.w3c.dom.NodeList;
import java.io.IOException;
import java.lang.reflect.Field;
-import java.util.Hashtable;
import java.util.Map;
import java.util.Set;
+import java.util.WeakHashMap;
import javax.el.ELResolver;
@@ -258,7 +258,7 @@ public class DefaultTemplateProcessorTes
}
// Access is typically protected so just bypass
userDataField.setAccessible(true);
- Hashtable<?, ?> userDataMap = (Hashtable<?, ?>) userDataField.get(doc);
+ WeakHashMap<?, ?> userDataMap = (WeakHashMap<?, ?>) userDataField.get(doc);
// There should be only one element in the user data map, if there are
more then the
// cloning process has put them there which can be a nasty source of
memory leaks. Consider
Modified:
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=1620491&r1=1620490&r2=1620491&view=diff
==============================================================================
---
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
(original)
+++
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
Tue Aug 26 00:53:36 2014
@@ -29,6 +29,7 @@ import com.gargoylesoftware.htmlunit.Fai
import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.DomElement;
import com.gargoylesoftware.htmlunit.html.DomNode;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
@@ -284,7 +285,7 @@ public class EndToEndTest {
HtmlPage page = executePageTest("templateRewriter", null);
// Verify that iteration attributes were processed
- HtmlElement attrs = page.getElementById("attrs");
+ DomElement attrs = page.getElementById("attrs");
List<HtmlElement> attrsList = attrs.getElementsByTagName("li");
assertEquals(3, attrsList.size());
@@ -297,13 +298,13 @@ public class EndToEndTest {
assertEquals("Maija", element.getTextContent().trim());
// Verify that the repeatTag was processed
- HtmlElement repeat = page.getElementById("repeatTag");
+ DomElement repeat = page.getElementById("repeatTag");
List<HtmlElement> repeatList = repeat.getElementsByTagName("li");
assertEquals(1, repeatList.size());
assertEquals("George", repeatList.get(0).getTextContent().trim());
// Verify that the ifTag was processed
- HtmlElement ifTag = page.getElementById("ifTag");
+ DomElement ifTag = page.getElementById("ifTag");
List<HtmlElement> ifList = ifTag.getElementsByTagName("li");
assertEquals(3, ifList.size());
assertEquals(1, page.getElementsByTagName("b").getLength());
@@ -337,7 +338,7 @@ public class EndToEndTest {
@Test
public void testJavaScriptCompile() throws Exception {
// AllJsFilter will redirect to a url with all features being requested
- webClient.setRedirectEnabled(true);
+ webClient.getOptions().setRedirectEnabled(true);
String containerJsUrl = EndToEndServer.SERVER_URL +
"/gadgets/js/all-features-please.js?container=default&c=1";
String gadgetJsUrl = EndToEndServer.SERVER_URL +
"/gadgets/js/all-features-please.js?container=default&c=0";
@@ -369,7 +370,7 @@ public class EndToEndTest {
webClient.setAjaxController(new NicelyResynchronizingAjaxController());
webClient.waitForBackgroundJavaScript(120000); // Closure can take a long
time...
webClient.setHTMLParserListener(HTMLParserListener.LOG_REPORTER);
- webClient.setTimeout(120000); // Closure can take a long time...
+ webClient.getOptions().setTimeout(120000); // Closure can take a long
time...
alertHandler = new CollectingAlertHandler();
webClient.setAlertHandler(alertHandler);
Modified: shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1620491&r1=1620490&r2=1620491&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Tue Aug 26 00:53:36 2014
@@ -1491,13 +1491,13 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
- <version>1.5.1</version>
+ <version>1.5.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -1584,13 +1584,13 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>14.0.1</version>
+ <version>18.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.7</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@@ -1649,7 +1649,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
+ <version>3.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -1677,7 +1677,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.1</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>rome</groupId>
@@ -1692,12 +1692,12 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>4.8.1.1</version>
+ <version>53.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.9</version>
+ <version>2.15</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -1722,7 +1722,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.3</version>
+ <version>1.4.7</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
@@ -1732,12 +1732,12 @@
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.17</version>
+ <version>1.9.21</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.sanselan</groupId>
@@ -1747,17 +1747,17 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>el-api</artifactId>
- <version>6.0.36</version>
+ <version>6.0.41</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-el</artifactId>
- <version>6.0.36</version>
+ <version>6.0.41</version>
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
<artifactId>juel-impl</artifactId>
- <version>2.2.5</version>
+ <version>2.2.7</version>
<exclusions>
<exclusion>
<groupId>de.odysseus.juel</groupId>
@@ -1768,12 +1768,12 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
+ <version>1.4.01</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.2</version>
+ <version>4.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
@@ -1783,7 +1783,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.6.1</version>
+ <version>1.7.7</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
