Author: vanto
Date: Thu Nov 15 18:41:13 2012
New Revision: 1409918
URL: http://svn.apache.org/viewvc?rev=1409918&view=rev
Log:
ODE-981: XMLBeans updated to 2.6.0
Modified:
ode/trunk/Rakefile
ode/trunk/dependencies.rb
Modified: ode/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=1409918&r1=1409917&r2=1409918&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Thu Nov 15 18:41:13 2012
@@ -22,16 +22,20 @@ require "buildr/javacc"
require "buildr/jetty"
require "buildr/hibernate"
+require File.join(File.dirname(__FILE__), 'repositories.rb')
+require File.join(File.dirname(__FILE__), 'dependencies.rb')
+
Buildr.settings.build['jmock'] = "1.2.0"
Buildr::Hibernate::REQUIRES[:xdoclet] = Buildr.group("xdoclet",
"xdoclet-xdoclet-module", "xdoclet-hibernate-module",
:under=>"xdoclet", :version=>"1.2.3") + ["xdoclet:xjavadoc:jar:1.1-j5"]
+# XMLBeans addon must use the same version as we do.
+Buildr::XMLBeans::REQUIRES.xmlbeans = artifact(XMLBEANS).version
+
# dirty workaround for BUILDR-541/BUILDR-508
Java.classpath << Buildr::OpenJPA::REQUIRES
-require File.join(File.dirname(__FILE__), 'repositories.rb')
-require File.join(File.dirname(__FILE__), 'dependencies.rb')
# Keep this structure to allow the build system to update version numbers.
VERSION_NUMBER = "1.4-SNAPSHOT"
Modified: ode/trunk/dependencies.rb
URL:
http://svn.apache.org/viewvc/ode/trunk/dependencies.rb?rev=1409918&r1=1409917&r2=1409918&view=diff
==============================================================================
--- ode/trunk/dependencies.rb (original)
+++ ode/trunk/dependencies.rb Thu Nov 15 18:41:13 2012
@@ -149,4 +149,4 @@ XBEAN = [
"org.apache.xbean:xbean-spring:jar:3.4.3",
"org.apache.xbean:xbean-classloader:jar:3.4.3"
]
-XMLBEANS = "org.apache.xmlbeans:xmlbeans:jar:2.3.0"
+XMLBEANS = "org.apache.xmlbeans:xmlbeans:jar:2.6.0"
