2:57 a.m.
Author: heiko.braun(a)jboss.com
Date: 2009-02-25 03:57:49 -0500 (Wed, 25 Feb 2009)
New Revision: 4016
Modified:
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/jpdl/pom.xml
jbpm4/trunk/pom.xml
Log:
Fix ESB dependencies. Use Woodstox as the default Stax implementation in test runs
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-02-25 08:24:48 UTC (rev 4015)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-02-25 08:57:49 UTC (rev 4016)
@@ -49,6 +49,16 @@
</exclusion>
</exclusions-->
</dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4.dependencies.esb</groupId>
+ <artifactId>test-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-lgpl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml 2009-02-25 08:24:48 UTC (rev 4015)
+++ jbpm4/trunk/modules/jpdl/pom.xml 2009-02-25 08:57:49 UTC (rev 4016)
@@ -51,11 +51,18 @@
<dependency>
<groupId>org.jbpm.jbpm4.dependencies.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jbpm.jbpm4.dependencies.esb</groupId>
- <artifactId>test-util</artifactId>
- </dependency>
</dependencies>
<!-- Plugins -->
@@ -82,7 +89,7 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <!--execution>
+ <!--execution>
<id>ant-copy-resources</id>
<phase>process-classes</phase>
<goals>
@@ -110,12 +117,12 @@
<property name="from.dir"
value="${basedir}/src/main/resources" />
<property name="to.dir"
value="${project.build.directory}/classes"/>
<ant antfile="scripts/antrun-patch-hsql-properties.xml"
target="patch" />
-
+
<echo>============================</echo>
<echo>Database config: ${database}</echo>
<echo>============================</echo>
<property name="database" value="${database}"
/>
- <property name="build.path.system"
value="${project.build.directory}" />
+ <property name="build.path.system"
value="${project.build.directory}" />
<ant antfile="scripts/antrun-jbpm-config.xml"
target="concat" />
</tasks>
</configuration>
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-02-25 08:24:48 UTC (rev 4015)
+++ jbpm4/trunk/pom.xml 2009-02-25 08:57:49 UTC (rev 4016)
@@ -63,7 +63,7 @@
<servlet-api.version>2.5</servlet-api.version>
<spring.version>2.5.4</spring.version>
<stax.api.version>1.0.1</stax.api.version>
-
+ <woodstox.version>3.2.6</woodstox.version>
<!-- Database Driver Versions -->
<hsqldb.version>1.8.0.7</hsqldb.version>
<mysql.connector.version>5.0.8</mysql.connector.version>
@@ -209,6 +209,11 @@
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -225,9 +230,9 @@
<version>${spring.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-lgpl</artifactId>
+ <version>${woodstox.version}</version>
</dependency>
<!-- Database Driver Versions -->