Author: rr
Date: Mon Apr 26 23:51:52 2010
New Revision: 938270
URL: http://svn.apache.org/viewvc?rev=938270&view=rev
Log:
ODE-806: Maven JBI packaging deps fix
Modified:
ode/branches/APACHE_ODE_1.X/dao-hibernate-db/build.xml
ode/branches/APACHE_ODE_1.X/jbi/pom.xml
ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml
Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate-db/build.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate-db/build.xml?rev=938270&r1=938269&r2=938270&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate-db/build.xml (original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate-db/build.xml Mon Apr 26 23:51:52
2010
@@ -93,7 +93,7 @@
</fileset>
</schemaexport>
<concat destfile="${db.scripts.dir}/@{db}.sql">
- <fileset file="${db.scripts.dir}/common.sql"/>
+ <fileset file="${sql.dir}/common.sql"/>
<fileset file="${sql.dir}/simplesch...@{db}.sql"/>
<fileset file="${db.scripts.dir}/parti...@{db}.sql"/>
</concat>
Modified: ode/branches/APACHE_ODE_1.X/jbi/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/pom.xml?rev=938270&r1=938269&r2=938270&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/pom.xml Mon Apr 26 23:51:52 2010
@@ -231,12 +231,11 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-dao-hibernate</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml?rev=938270&r1=938269&r2=938270&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml Mon Apr 26
23:51:52 2010
@@ -91,6 +91,7 @@
<include>commons-dbcp:commons-dbcp</include>
<include>commons-lang:commons-lang</include>
<include>commons-pool:commons-pool</include>
+ <include>commons-beanutils:commons-beanutils</include>
<include>commons-primitives:commons-primitives</include>
<include>org.apache.derby:derby</include>
<include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include>
@@ -113,9 +114,13 @@
<include>tranql:tranql-connector</include>
<include>xalan:xalan</include>
<include>org.apache.xmlbeans:xmlbeans</include>
- <include>com.thoughtworks.xstream:xstream</include>
<include>axion:axion</include>
<include>xerces:xercesImpl</include>
+ <include>org.objectweb.howl:howl</include>
+ <include>xstream:xstream</include>
+ <include>xalan:serializer</include>
+ <include>xml-apis:xml-apis</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
</includes>
</dependencySet>
