[GEOS-6075] Leverage XStream ability to ignore unknown elements

geoserver · Feb 26, 2014 · 5ec2759 · 5ec2759
1 parent b71dfd4
commit 5ec2759
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/src/main/java/org/geoserver/config/util/XStreamPersister.java b/src/main/src/main/java/org/geoserver/config/util/XStreamPersister.java
@@ -285,6 +285,10 @@ protected void init(XStream xs) {
         // Default implementations
         initImplementationDefaults(xs);
 
+        // ignore unkonwn fields, this should help using data dirs that has new config elements
+        // with older versions of GeoServer
+        xs.ignoreUnknownElements();
+
         // Aliases
         xs.alias("global", GeoServerInfo.class);
         xs.alias("settings", SettingsInfo.class);

diff --git a/src/pom.xml b/src/pom.xml
@@ -986,7 +986,7 @@
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.4.3</version>
+      <version>1.4.7</version>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>