It was only in License (still unsure how/why), done, thanks Jacques
On Monday, January 13, 2014 1:30 PM, adrian.c...@sandglass-software.com wrote > The classpath entry for xpp3-1.1.4c.jar wasn't changed. > > Adrian Crum > Sandglass Software > www.sandglass-software.com > > On 1/13/2014 4:56 AM, jler...@apache.org wrote: >> Author: jleroux >> Date: Mon Jan 13 09:56:22 2014 >> New Revision: 1557673 >> >> URL: http://svn.apache.org/r1557673 >> Log: >> "Applied fix from trunk for revision: 1557440" (just handled a conflict in >> .classpath by hand) >> ------------------------------------------------------------------------ >> r1557440 | adrianc | 2014-01-11 20:23:58 +0100 (sam. 11 janv. 2014) | 2 >> lignes >> >> Updated XStream library to latest version. >> >> ------------------------------------------------------------------------ >> >> Added: >> ofbiz/branches/release12.04/framework/base/lib/xpp3-1.1.4c.jar >> - copied unchanged from r1557440, >> ofbiz/trunk/framework/base/lib/xpp3-1.1.4c.jar >> ofbiz/branches/release12.04/framework/base/lib/xstream-1.4.6.jar >> - copied unchanged from r1557440, >> ofbiz/trunk/framework/base/lib/xstream-1.4.6.jar >> Removed: >> ofbiz/branches/release12.04/framework/base/lib/xpp3_min-1.1.4c.jar >> ofbiz/branches/release12.04/framework/base/lib/xstream-1.3.1.jar >> Modified: >> ofbiz/branches/release12.04/ (props changed) >> ofbiz/branches/release12.04/.classpath >> ofbiz/branches/release12.04/LICENSE >> >> Propchange: ofbiz/branches/release12.04/ >> ------------------------------------------------------------------------------ >> Merged /ofbiz/trunk:r1557440 >> >> Modified: ofbiz/branches/release12.04/.classpath >> URL: >> http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1557673&r1=1557672&r2=1557673&view=diff >> ============================================================================== >> --- ofbiz/branches/release12.04/.classpath (original) >> +++ ofbiz/branches/release12.04/.classpath Mon Jan 13 09:56:22 2014 >> @@ -64,7 +64,7 @@ >> <classpathentry kind="lib" >> path="framework/base/lib/xmlrpc-client-3.1.2.jar"/> >> <classpathentry kind="lib" >> path="framework/base/lib/xmlrpc-common-3.1.2.jar"/> >> <classpathentry kind="lib" >> path="framework/base/lib/xmlrpc-server-3.1.2.jar"/> >> - <classpathentry kind="lib" path="framework/base/lib/xstream-1.3.1.jar"/> >> + <classpathentry kind="lib" path="framework/base/lib/xstream-1.4.6.jar"/> >> <classpathentry kind="lib" >> path="framework/base/lib/xpp3_min-1.1.4c.jar"/> >> <classpathentry kind="lib" >> path="framework/base/lib/commons/commons-beanutils-1.7.0.jar"/> >> <classpathentry kind="lib" >> path="framework/base/lib/commons/commons-cli-1.0.jar"/> >> >> Modified: ofbiz/branches/release12.04/LICENSE >> URL: >> http://svn.apache.org/viewvc/ofbiz/branches/release12.04/LICENSE?rev=1557673&r1=1557672&r2=1557673&view=diff >> ============================================================================== >> --- ofbiz/branches/release12.04/LICENSE (original) >> +++ ofbiz/branches/release12.04/LICENSE Mon Jan 13 09:56:22 2014 >> @@ -452,8 +452,8 @@ framework/base/lib/httpunit-1.7.jar >> framework/base/lib/ical4j-1.0-rc2.jar >> lib/build/javacc/javacc.jar (5.0) >> framework/base/lib/javolution-5.4.3.jar >> -framework/base/lib/xpp3_min-1.1.4c.jar >> -framework/base/lib/xstream-1.3.1.jar >> +framework/base/lib/xpp3-1.1.4c.jar >> +framework/base/lib/xstream-1.4.6.jar >> framework/base/lib/owasp-esapi-full-java-1.4.jar >> framework/base/lib/scripting/antlr-2.7.6.jar >> framework/base/lib/scripting/asm-3.2.jar
