Revision: 16699
http://sourceforge.net/p/gate/code/16699
Author: markagreenwood
Date: 2013-05-30 11:37:04 +0000 (Thu, 30 May 2013)
Log Message:
-----------
upgraded XStream, Woodstox, and XPP3 to latest versions and added a fix (thanks
Ian) so that we can use CDATA blocks inside xgapp files -- this used to work
but was broken on the change from Woodstox 3.x to 4.x
Modified Paths:
--------------
gate/trunk/build/deploy/maven/gate-core.pom.template
gate/trunk/ivy.xml
gate/trunk/src/gate/util/persistence/PersistenceManager.java
Modified: gate/trunk/build/deploy/maven/gate-core.pom.template
===================================================================
--- gate/trunk/build/deploy/maven/gate-core.pom.template 2013-05-26
01:19:40 UTC (rev 16698)
+++ gate/trunk/build/deploy/maven/gate-core.pom.template 2013-05-30
11:37:04 UTC (rev 16699)
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-lgpl</artifactId>
- <version>4.1.3</version>
+ <version>4.2.0</version>
<scope>compile</scope>
<exclusions>
<!-- exclude stuff that is part of Java 6 core -->
@@ -176,7 +176,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.2</version>
+ <version>1.4.4</version>
<scope>compile</scope>
<exclusions>
<!-- we will pull in the full xpp3 so we don't need these -->
@@ -195,7 +195,7 @@
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.3.4.O</version>
+ <version>1.1.4c</version>
<scope>runtime</scope>
</dependency>
Modified: gate/trunk/ivy.xml
===================================================================
--- gate/trunk/ivy.xml 2013-05-26 01:19:40 UTC (rev 16698)
+++ gate/trunk/ivy.xml 2013-05-30 11:37:04 UTC (rev 16699)
@@ -65,7 +65,7 @@
<!-- We use Woodstox instead of the default Sun StAX implementation as it
seems to behave better.
NOTE: I don't know if this is still the case but it seems safer not
to break things! -->
- <dependency org="org.codehaus.woodstox" name="woodstox-core-lgpl"
rev="4.1.3">
+ <dependency org="org.codehaus.woodstox" name="woodstox-core-lgpl"
rev="4.2.0">
<exclude org="javax.xml.stream" module="stax-api" />
</dependency>
@@ -77,10 +77,10 @@
<!--required for loading and saving .gapp files and by sime plugins.
we pull in the full XPP3 so we only need XStream's master artifact -->
- <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.2"
conf="required->master" />
+ <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.4"
conf="required->master" />
<!-- XPP3 provides the actual implementation under pinning our use of
XStream -->
- <dependency org="xpp3" name="xpp3" rev="1.1.3.4.O"
conf="runtime->master,runtime" />
+ <dependency org="xpp3" name="xpp3" rev="1.1.4c"
conf="runtime->master,runtime" />
<!-- needed by XSteam at runtime -->
<dependency org="jaxen" name="jaxen" rev="1.1" conf="runtime->master" />
Modified: gate/trunk/src/gate/util/persistence/PersistenceManager.java
===================================================================
--- gate/trunk/src/gate/util/persistence/PersistenceManager.java
2013-05-26 01:19:40 UTC (rev 16698)
+++ gate/trunk/src/gate/util/persistence/PersistenceManager.java
2013-05-30 11:37:04 UTC (rev 16699)
@@ -855,6 +855,7 @@
rawStream = url.openStream());
try {
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+ inputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
XMLStreamReader xsr = inputFactory.createXMLStreamReader(
url.toExternalForm(), inputReader);
reader = new StaxReader(new QNameMap(), xsr);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs
