Author: manaRH
Date: 2012-10-30 12:04:49 -0400 (Tue, 30 Oct 2012)
New Revision: 15328
Modified:
branches/enterprise/WFK-2_1/distribution/pom.xml
branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
Log:
bz 867418 added for seam-gen correct hibernate-core runtime for htools
Modified: branches/enterprise/WFK-2_1/distribution/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/pom.xml 2012-10-30 15:58:56 UTC (rev 15327)
+++ branches/enterprise/WFK-2_1/distribution/pom.xml 2012-10-30 16:04:49 UTC (rev 15328)
@@ -197,6 +197,27 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-ui</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.0.0.Final</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml</groupId>
+ <artifactId>classmate</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>4.0.1.Final-redhat-1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2012-10-30
15:58:56 UTC (rev 15327)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2012-10-30
16:04:49 UTC (rev 15328)
@@ -144,6 +144,8 @@
<includes>
<include>org.jboss.seam:jboss-seam-gen:jar</include>
<include>org.hibernate:hibernate-tools:jar</include>
+ <include>org.hibernate:hibernate-core:jar:4.0.0.Final</include>
+ <include>commons-collections:commons-collections:jar</include>
<include>org.beanshell:bsh:jar</include>
<include>org.hibernate:jtidy:jar</include>
<include>freemarker:freemarker:jar</include>
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2012-10-30 15:58:56 UTC (rev
15327)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2012-10-30 16:04:49 UTC (rev
15328)
@@ -1478,7 +1478,7 @@
<pathelement path="${seam.dir}/lib/gen/text.jar"/>
<pathelement path="${seam.dir}/lib/dom4j.jar"/>
<pathelement path="${seam.dir}/lib/persistence-api.jar"/>
- <pathelement path="${seam.dir}/lib/hibernate-core.jar"/>
+ <pathelement path="${seam.dir}/lib/gen/hibernate-core.jar"/>
<pathelement
path="${seam.dir}/lib/hibernate-commons-annotations.jar"/>
<pathelement
path="${seam.dir}/lib/hibernate-annotations.jar"/>
<pathelement
path="${seam.dir}/lib/hibernate-entitymanager.jar"/>
@@ -1490,7 +1490,7 @@
<pathelement path="${seam.dir}/lib/slf4j-api.jar"/>
<pathelement path="${seam.dir}/lib/slf4j-log4j12.jar"/>
<pathelement path="${seam.dir}/lib/log4j.jar"/>
- <pathelement
path="${seam.dir}/lib/commons-collections.jar"/>
+ <pathelement
path="${seam.dir}/lib/gen/commons-collections.jar"/>
<pathelement path="${seam.dir}/lib/commons-logging.jar"/>
<pathelement path="${seam.dir}/lib/javassist.jar"/>
<pathelement path="${seam.dir}/lib/cglib-nodep.jar"/>