[jbpm-commits] JBoss JBPM SVN: r4185 - in jbpm3/branches/jbpm-3.2.5.SP: modules/core and 2 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-03-07 02:30:27 -0500 (Sat, 07 Mar 2009)
New Revision: 4185

Modified:
   jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml
Log:
merge r4169:4171 from branch 3.2.6.GA - remove dependency on slf4j

Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh	2009-03-07 07:03:51 UTC (rev 4184)
+++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh	2009-03-07 07:30:27 UTC (rev 4185)
@@ -66,9 +66,6 @@
 rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml
 cp $JBOSS_HOME/docs/examples/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml
 cp $JBOSS_HOME/docs/examples/jbpm/hibernate.cfg.$DATABASE.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml
-if [ $CONTAINER = "jboss500" ]; then
-  rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/slf4j-api.jar
-fi
 
 # FIXME: find out whether jTDS can be made to work with XA data source
 # https://jira.jboss.org/jira/browse/JBPM-1818

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml	2009-03-07 07:03:51 UTC (rev 4184)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml	2009-03-07 07:30:27 UTC (rev 4185)
@@ -79,22 +79,11 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
@@ -107,11 +96,6 @@
       <artifactId>jaxen</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
 
     <!-- Remove this static dependency -->
     <dependency>

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml	2009-03-07 07:03:51 UTC (rev 4184)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml	2009-03-07 07:30:27 UTC (rev 4185)
@@ -159,14 +159,6 @@
       <type>zip</type>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
     </dependency>

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml	2009-03-07 07:03:51 UTC (rev 4184)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml	2009-03-07 07:30:27 UTC (rev 4185)
@@ -169,8 +169,6 @@
         <include name="jbpm-identity.jar" />
         <include name="junit.jar" />
         <include name="jsf-console.war" />
-        <include name="slf4j-api.jar" />
-        <include name="slf4j-log4j12.jar" />
         <include name="log4j.jar" />
       </fileset>
 
@@ -210,8 +208,6 @@
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
         <include name="jbpm-jpdl.jar" />
         <include name="jbpm-identity.jar" />
-        <include name="slf4j-api.jar" />
-        <include name="slf4j-log4j12.jar" />
       </fileset>
       <file src="@{deploy.artifacts.dir}/lib/jbpm-identity-service.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
         unpack="true" override="true" />