6:17 p.m.
Author: alex.guizar(a)jboss.com
Date: 2010-06-22 19:17:42 -0400 (Tue, 22 Jun 2010)
New Revision: 6431
Modified:
jbpm4/trunk/modules/pvm/pom.xml
jbpm4/trunk/modules/test-cfg/
jbpm4/trunk/modules/test-cfg/.classpath
jbpm4/trunk/modules/test-cfg/.project
jbpm4/trunk/modules/test-cfg/pom.xml
jbpm4/trunk/pom.xml
jbpm4/trunk/qa/hudson-jbpm4-base.sh
jbpm4/trunk/qa/hudson-jbpm4-cfg.sh
Log:
JBPM-2893: fix test-cfg module, broken after the dependency scope review
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2010-06-22 22:03:45 UTC (rev 6430)
+++ jbpm4/trunk/modules/pvm/pom.xml 2010-06-22 23:17:42 UTC (rev 6431)
@@ -47,6 +47,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<scope>provided</scope>
@@ -159,12 +164,6 @@
<artifactId>spring</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Plugins -->
Property changes on: jbpm4/trunk/modules/test-cfg
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Modified: jbpm4/trunk/modules/test-cfg/.classpath
===================================================================
--- jbpm4/trunk/modules/test-cfg/.classpath 2010-06-22 22:03:45 UTC (rev 6430)
+++ jbpm4/trunk/modules/test-cfg/.classpath 2010-06-22 23:17:42 UTC (rev 6431)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
- <classpathentry kind="src" output="target/test-classes"
path="src/test/resources"/>
+ <classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
+ <classpathentry excluding="**" kind="src"
output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: jbpm4/trunk/modules/test-cfg/.project
===================================================================
--- jbpm4/trunk/modules/test-cfg/.project 2010-06-22 22:03:45 UTC (rev 6430)
+++ jbpm4/trunk/modules/test-cfg/.project 2010-06-22 23:17:42 UTC (rev 6431)
@@ -1,18 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbpm-test-cfg</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-test-cfg</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: jbpm4/trunk/modules/test-cfg/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-cfg/pom.xml 2010-06-22 22:03:45 UTC (rev 6430)
+++ jbpm4/trunk/modules/test-cfg/pom.xml 2010-06-22 23:17:42 UTC (rev 6431)
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: pom.xml 5246 2009-07-06 11:07:48Z tom.baeyens(a)jboss.com $ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<!-- $Id$ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<name>jBPM 4 - Test Cfg</name>
<groupId>org.jbpm.jbpm4</groupId>
@@ -28,7 +28,6 @@
<!-- Dependencies -->
<dependencies>
-
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-api</artifactId>
@@ -48,21 +47,37 @@
<artifactId>jbpm-bpmn</artifactId>
<scope>runtime</scope>
</dependency>
+
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.4.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
</project>
Property changes on: jbpm4/trunk/modules/test-cfg/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2010-06-22 22:03:45 UTC (rev 6430)
+++ jbpm4/trunk/pom.xml 2010-06-22 23:17:42 UTC (rev 6431)
@@ -45,6 +45,7 @@
<properties>
<activation.version>1.1.1</activation.version>
<apache.ant.version>1.7.0</apache.ant.version>
+ <asm.version>1.5.3</asm.version>
<aspectjrt.version>1.5.3</aspectjrt.version>
<beanshell.version>2.0b5</beanshell.version>
<cactus.version>1.8.1</cactus.version>
@@ -212,6 +213,11 @@
<version>${apache.ant.version}</version>
</dependency>
<dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>${aspectjrt.version}</version>
Modified: jbpm4/trunk/qa/hudson-jbpm4-base.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-base.sh 2010-06-22 22:03:45 UTC (rev 6430)
+++ jbpm4/trunk/qa/hudson-jbpm4-base.sh 2010-06-22 23:17:42 UTC (rev 6431)
@@ -2,4 +2,4 @@
#
# runs the smoke test suite
-mvn -U clean install
+mvn -U -Dmaven.test.failure.ignore=true clean install
Modified: jbpm4/trunk/qa/hudson-jbpm4-cfg.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-cfg.sh 2010-06-22 22:03:45 UTC (rev 6430)
+++ jbpm4/trunk/qa/hudson-jbpm4-cfg.sh 2010-06-22 23:17:42 UTC (rev 6431)
@@ -2,7 +2,6 @@
#
# runs the configuration test suite
-mvn clean install
+mvn -DskipTests clean install
cd modules/test-cfg
-mvn clean test
-cd ../..
+mvn -Dmaven.test.failure.ignore=true clean test