Author: manaRH
Date: 2012-10-10 09:32:12 -0400 (Wed, 10 Oct 2012)
New Revision: 15246
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml
branches/enterprise/WFK-2_1/pom.xml
Log:
upgraded used jboss-bom to 1.0.1.Final-redhat-1 and related changes in mgmt of
deps for WFK assembly
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-10 12:33:25 UTC (rev
15245)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-10 13:32:12 UTC (rev
15246)
@@ -44,7 +44,7 @@
<version.richfaces>4.2.3.Final-redhat-1</version.richfaces>
<version.arquillian_core>1.0.1.Final</version.arquillian_core>
<version.org.hibernate.search>4.1.1.Final-redhat-1</version.org.hibernate.search>
- <version.org.jboss.bom>1.0.0.M12-redhat-1</version.org.jboss.bom>
+ <version.org.jboss.bom>1.0.1.Final-redhat-1</version.org.jboss.bom>
<!-- ***************** -->
<!-- Repository Deployment URLs -->
<!-- ***************** -->
@@ -60,7 +60,7 @@
<dependencies>
<dependency>
- <groupId>org.jboss.bom</groupId>
+ <groupId>com.redhat.jboss.wfk.boms</groupId>
<artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
<version>${version.org.jboss.bom}</version>
<type>pom</type>
@@ -75,6 +75,14 @@
<scope>import</scope>
</dependency>
+ <!-- managed hibernate-commons-annotations here to
overwrite usage
+ of other versions in transitive deps -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+
<artifactId>hibernate-commons-annotations</artifactId>
+ <version>3.2.0.Final-redhat-1</version>
+ </dependency>
+
<!-- not supported shrinkwrap artifacts -->
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml 2012-10-10 12:33:25 UTC
(rev 15245)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml 2012-10-10 13:32:12 UTC
(rev 15246)
@@ -42,6 +42,29 @@
<artifactId>hibernate-tools</artifactId>
<version>4.0.0-CR1</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </exclusion>
+
+ </exclusions>
</dependency>
<dependency>
Modified: branches/enterprise/WFK-2_1/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/pom.xml 2012-10-10 12:33:25 UTC (rev 15245)
+++ branches/enterprise/WFK-2_1/pom.xml 2012-10-10 13:32:12 UTC (rev 15246)
@@ -141,12 +141,6 @@
<version>${version.jbossas7}</version>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
-
<artifactId>hibernate-commons-annotations</artifactId>
- <version>3.2.0.Final-redhat-1</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
