[jbpm-commits] JBoss JBPM SVN: r4654 - in jbpm4/trunk: modules/pvm and 2 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-04-28 10:57:17 -0400 (Tue, 28 Apr 2009)
New Revision: 4654

Modified:
   jbpm4/trunk/modules/pvm/pom.xml
   jbpm4/trunk/modules/test-base/pom.xml
   jbpm4/trunk/pom.xml
   jbpm4/trunk/qa/jbpm4-jboss.sh
Log:
fixing hibernate upgrade dependencies

Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml	2009-04-28 11:06:14 UTC (rev 4653)
+++ jbpm4/trunk/modules/pvm/pom.xml	2009-04-28 14:57:17 UTC (rev 4654)
@@ -78,18 +78,57 @@
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
+      <artifactId>hibernate-core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.identity</groupId>
       <artifactId>idm</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.persistence</groupId>
+          <artifactId>persistence-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-commons-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.hibernate</groupId>
+          <artifactId>ejb3-persistence</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-entitymanager</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.cache</groupId>
+          <artifactId>jbosscache-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
+      </exclusions>          
     </dependency>
     <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+      <version>3.4.0.GA</version>
+    </dependency>
+    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <scope>test</scope>

Modified: jbpm4/trunk/modules/test-base/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-base/pom.xml	2009-04-28 11:06:14 UTC (rev 4653)
+++ jbpm4/trunk/modules/test-base/pom.xml	2009-04-28 14:57:17 UTC (rev 4654)
@@ -43,8 +43,16 @@
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
+      <artifactId>hibernate-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+    </dependency>
   </dependencies>
   
   <!-- Plugins -->

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-04-28 11:06:14 UTC (rev 4653)
+++ jbpm4/trunk/pom.xml	2009-04-28 14:57:17 UTC (rev 4654)
@@ -47,8 +47,8 @@
     <apache.ant.version>1.7.0</apache.ant.version>
     <cactus.version>13-1.7.1</cactus.version>
     <gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version>
-    <hibernate.version>3.2.6.ga</hibernate.version>
-    <hibernate.annotations.version>3.3.1.GA</hibernate.annotations.version>
+    <hibernate.version>3.3.1.GA</hibernate.version>
+    <slf4j.version>1.5.2</slf4j.version>
     <hsqldb.version>1.8.0.7</hsqldb.version>
     <izpack.version>4.2.1</izpack.version>
     <jboss.identity.version>1.0.0.Alpha2</jboss.identity.version>
@@ -194,15 +194,20 @@
       </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate</artifactId>
+        <artifactId>hibernate-core</artifactId>
         <version>${hibernate.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-annotations</artifactId>
-        <version>${hibernate.annotations.version}</version>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-jdk14</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.jboss.identity</groupId>
         <artifactId>idm</artifactId>
         <version>${jboss.identity.version}</version>

Modified: jbpm4/trunk/qa/jbpm4-jboss.sh
===================================================================
--- jbpm4/trunk/qa/jbpm4-jboss.sh	2009-04-28 11:06:14 UTC (rev 4653)
+++ jbpm4/trunk/qa/jbpm4-jboss.sh	2009-04-28 14:57:17 UTC (rev 4654)
@@ -7,12 +7,12 @@
 echo database.......... $DATABASE
 echo jboss.version..... $JBOSS_VERSION
 echo workspace......... $WORKSPACE
-echo jboss.distro.dir.. $SOURCE_REPO
+echo jboss.distro.dir.. $SOURCE_REPO/jboss
 
 mvn -Pdistro -Pschemadocs clean install
 
 ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup
 
-mvn -Djboss.bind.address=localhost clean test
+mvn -Djboss.bind.address=localhost test
 
 ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.teardown