Author: rmannibucau
Date: Tue Oct 4 13:54:20 2011
New Revision: 1178790
URL: http://svn.apache.org/viewvc?rev=1178790&view=rev
Log:
fixing hibernate profile and webapps
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml
openejb/trunk/openejb/container/openejb-core-hibernate/pom.xml
openejb/trunk/openejb/pom.xml
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml?rev=1178790&r1=1178789&r2=1178790&view=diff
==============================================================================
---
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml
(original)
+++
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml
Tue Oct 4 13:54:20 2011
@@ -80,8 +80,9 @@
<!-- should be in a pom exclusion but it does perfectly the trick -->
<exclude>org.springframework:*</exclude>
- <!-- wars -->
+ <!-- wars and pom -->
<exclude>*:war</exclude>
+ <exclude>*:pom</exclude>
</excludes>
</dependencySet>
<dependencySet>
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml?rev=1178790&r1=1178789&r2=1178790&view=diff
==============================================================================
---
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
(original)
+++
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
Tue Oct 4 13:54:20 2011
@@ -89,6 +89,7 @@
<!--<exclude>org.apache.activemq:activemq-core</exclude>-->
<!--<exclude>org.apache.activemq:activemq-ra</exclude>-->
<!--<exclude>org.apache.openejb:javaee-api</exclude>-->
+ <exclude>*:pom</exclude>
</excludes>
</dependencySet>
<dependencySet>
Modified: openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml?rev=1178790&r1=1178789&r2=1178790&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml (original)
+++ openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml Tue Oct 4 13:54:20
2011
@@ -102,7 +102,7 @@
<dependency> <!-- to avoid to force exclusions everywhere -->
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${project.version}</version>
+ <version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openjpa</groupId>
@@ -142,7 +142,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core-hibernate</artifactId>
<type>pom</type>
- <version>${project.version}</version>
+ <version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb/container/openejb-core-hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core-hibernate/pom.xml?rev=1178790&r1=1178789&r2=1178790&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core-hibernate/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-core-hibernate/pom.xml Tue Oct 4
13:54:20 2011
@@ -109,8 +109,8 @@
<properties>
<asm.version>3.3.1</asm.version>
<cglib.version>2.2.2</cglib.version>
- <ehcache.version>2.4.3</ehcache.version>
- <hibernate.version>3.6.5.Final</hibernate.version>
+ <ehcache.version>2.4.5</ehcache.version>
+ <hibernate.version>4.0.0.CR4</hibernate.version>
<hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
</properties>
</project>
Modified: openejb/trunk/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1178790&r1=1178789&r2=1178790&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Tue Oct 4 13:54:20 2011
@@ -399,6 +399,11 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>terracotta</id>
+ <name>Terracotta</name>
+ <url>http://repo.terracotta.org/maven2/</url>
+ </repository>
<!--<repository>-->
<!--<id>java.net</id>-->
<!--<url>http://download.java.net/maven/1</url>-->
