[jbpm-commits] JBoss JBPM SVN: r6812 - in jbpm3/branches/jbpm-3.2-soa: core and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Nov 10 16:01:04 EST 2010


Author: alex.guizar at jboss.com
Date: 2010-11-10 16:01:03 -0500 (Wed, 10 Nov 2010)
New Revision: 6812

Modified:
   jbpm3/branches/jbpm-3.2-soa/core/pom.xml
   jbpm3/branches/jbpm-3.2-soa/db/pom.xml
   jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml
   jbpm3/branches/jbpm-3.2-soa/distribution/src/main/etc/version.info.xml
   jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml
   jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
JBPM-2959 ship backport-util-concurrent library with distribution

Modified: jbpm3/branches/jbpm-3.2-soa/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/pom.xml	2010-11-10 07:15:16 UTC (rev 6811)
+++ jbpm3/branches/jbpm-3.2-soa/core/pom.xml	2010-11-10 21:01:03 UTC (rev 6812)
@@ -29,7 +29,6 @@
     <dependency>
       <groupId>backport-util-concurrent</groupId>
       <artifactId>backport-util-concurrent</artifactId>
-      <version>3.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -92,6 +91,12 @@
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jdom</groupId>
+          <artifactId>jdom</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
@@ -193,10 +198,12 @@
       </plugin>
 
       <plugin>
-      	<artifactId>maven-surefire-plugin</artifactId>
+        <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
+            <!-- database schema creation is costly; some drivers cache metadata -->
             <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
+            <!-- performance test is slow; misplaced along functional tests -->
             <exclude>org/jbpm/perf/PerformanceTest.java</exclude>
           </excludes>
         </configuration>
@@ -225,34 +232,6 @@
     </profile>
 
     <!--
-      Name: mssql
-      Desc: SQL Server Test Exclusions   
-    -->
-    <profile>
-      <id>mssql</id>
-      <activation>
-        <property>
-          <name>database</name>
-          <value>mssql</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
-                <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
-                <exclude>org/jbpm/perf/PerformanceTest.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!--
       Name: sybase
       Desc: Sybase Test Exclusions
     -->
@@ -270,8 +249,10 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <excludes>
-                <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
+                <!-- JBPM-2958 driver fails to retrieve database metadata -->
                 <exclude>org/jbpm/jbpm2958/TimerCalendarTest.java</exclude>
+                <!-- default exclusions -->
+                <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
                 <exclude>org/jbpm/perf/PerformanceTest.java</exclude>
               </excludes>
             </configuration>

Modified: jbpm3/branches/jbpm-3.2-soa/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/db/pom.xml	2010-11-10 07:15:16 UTC (rev 6811)
+++ jbpm3/branches/jbpm-3.2-soa/db/pom.xml	2010-11-10 21:01:03 UTC (rev 6812)
@@ -59,6 +59,7 @@
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>runtime</scope>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 

Modified: jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml	2010-11-10 07:15:16 UTC (rev 6811)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml	2010-11-10 21:01:03 UTC (rev 6812)
@@ -175,6 +175,14 @@
       <artifactId>ant</artifactId>
     </dependency>
     <dependency>
+      <groupId>backport-util-concurrent</groupId>
+      <artifactId>backport-util-concurrent</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>bsh</groupId>
+      <artifactId>bsh</artifactId>
+    </dependency>
+    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
@@ -182,6 +190,10 @@
       <groupId>org.jboss.cluster</groupId>
       <artifactId>hibernate-jbc-cacheprovider</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
 
     <!-- Database Drivers -->
     <dependency>

Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/etc/version.info.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/etc/version.info.xml	2010-11-10 07:15:16 UTC (rev 6811)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/etc/version.info.xml	2010-11-10 21:01:03 UTC (rev 6812)
@@ -5,6 +5,7 @@
 
   <classpathentry path="lib/antlr.jar" />
   <classpathentry path="lib/asm.jar"/>
+  <classpathentry path="lib/backport-util-concurrent.jar" />
   <classpathentry path="lib/bsh.jar"/>
   <classpathentry path="lib/cglib.jar"/>
   <classpathentry path="lib/commons-collections.jar"/>
@@ -13,7 +14,6 @@
   <classpathentry path="lib/hibernate.jar"/>
   <classpathentry path="lib/hsqldb.jar"/>
   <classpathentry path="lib/junit.jar"/>
-  <classpathentry path="lib/log4j.jar"/>
   
   <config path="config"/>
   <examples path="examples" />

Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml	2010-11-10 07:15:16 UTC (rev 6811)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml	2010-11-10 21:01:03 UTC (rev 6812)
@@ -178,6 +178,7 @@
       <fileset dir="@{assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib">
         <include name="antlr.jar" />
         <include name="asm.jar" />
+        <include name="backport-util-concurrent.jar" />
         <include name="bsh.jar" />
         <include name="cglib.jar" />
         <include name="commons-collections.jar" />
@@ -186,7 +187,6 @@
         <include name="hibernate.jar" />
         <include name="hsqldb.jar" />
         <include name="junit.jar" />
-        <include name="log4j.jar" />
       </fileset>
 
       <!-- jbpm3/src - Must be called 'src' because the GPD depends on it -->

Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml	2010-11-10 07:15:16 UTC (rev 6811)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml	2010-11-10 21:01:03 UTC (rev 6812)
@@ -90,6 +90,11 @@
         <version>1.7.0</version>
       </dependency>
       <dependency>
+        <groupId>backport-util-concurrent</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
+        <version>3.1</version>
+      </dependency>
+      <dependency>
         <groupId>bsh</groupId>
         <artifactId>bsh</artifactId>
         <version>1.3.0</version>



More information about the jbpm-commits mailing list