Seam SVN: r14056 - in branches/enterprise/JBPAPP_5_0: src/main/org/jboss/seam/persistence and 1 other directory.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-02-22 11:13:01 -0500 (Tue, 22 Feb 2011)
New Revision: 14056
Modified:
branches/enterprise/JBPAPP_5_0/build/root.pom.xml
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/persistence/HibernateSessionProxy.java
Log:
JBPAPP-5931 - aligning EAP 5.1.1 dependencies
Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2011-02-17 08:03:57 UTC (rev 14055)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2011-02-22 16:13:01 UTC (rev 14056)
@@ -16,7 +16,7 @@
<version.testng>5.9</version.testng>
<version.resteasy>1.2.1.GA</version.resteasy>
<version.spring>2.5.6.SEC02</version.spring>
- <version.hibernate-core>3.3.2.GA_CP03</version.hibernate-core>
+ <version.hibernate-core>3.3.2.GA_CP04</version.hibernate-core>
</properties>
<dependencyManagement>
@@ -253,7 +253,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.2.5.GA</version>
+ <version>3.2.7.GA</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -263,13 +263,17 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>2.6.16.GA</version>
+ <version>2.6.19.Final</version>
</dependency>
<dependency>
@@ -383,7 +387,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA_CP03</version>
+ <version>3.4.0.GA_CP04</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -411,7 +415,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA_CP03</version>
+ <version>3.4.0.GA_CP04</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -455,7 +459,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
- <version>3.1.1.GA_CP03</version>
+ <version>3.1.1.GA_CP04</version>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
@@ -505,7 +509,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
@@ -972,7 +976,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.2.16.GA</version>
+ <version>2.2.17.GA</version>
<exclusions>
<exclusion>
<groupId>apache-xerces</groupId>
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/persistence/HibernateSessionProxy.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/persistence/HibernateSessionProxy.java 2011-02-17 08:03:57 UTC (rev 14055)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/persistence/HibernateSessionProxy.java 2011-02-22 16:13:01 UTC (rev 14056)
@@ -672,4 +672,17 @@
public void delete(String s, Object o, boolean b, Set set) {
getDelegateEventSource().delete( s, o, b, set );
}
+
+ @Override
+ public void registerInsertedKey(EntityPersister arg0, Serializable arg1)
+ {
+ getDelegateSessionImplementor().registerInsertedKey(arg0, arg1);
+
+ }
+
+ @Override
+ public boolean wasInsertedDuringTransaction(EntityPersister arg0, Serializable arg1)
+ {
+ return getDelegateSessionImplementor().wasInsertedDuringTransaction(arg0, arg1);
+ }
}