Permalink
Browse files

Upgrade hibernate and remove optional dependencies

  • Loading branch information...
1 parent 5e3331f commit 6808407500680156eea716a3294cbcdaac2f9c4e @pepite pepite committed May 6, 2012
View
@@ -43,13 +43,11 @@ require: &allDependencies
- org.apache.ivy -> ivy 2.2.0
- org.bouncycastle -> bcprov-jdk15 1.45
- org.codehaus.groovy -> groovy-all 1.8.6
- - org.eclipse.jdt.core 3.8.0.v_C18
- - org.hibernate -> hibernate-core 4.1.1.Final
- - org.hibernate -> hibernate-ehcache 4.1.1.Final
- - org.hibernate -> hibernate-c3p0 4.1.1.Final
+ - org.eclipse.jdt.core 3.8.0.v_C18
+ - org.hibernate -> hibernate-core 4.1.3.Final
- org.hibernate -> hibernate-commons-annotations 4.0.1.Final
- - org.hibernate -> hibernate-entitymanager 4.1.1.Final
- - org.hibernate -> jboss-logging 3.1.0.CR2
+ - org.hibernate -> hibernate-entitymanager 4.1.3.Final
+ - org.hibernate -> jboss-logging 3.1.0.GA
- org.hibernate -> jboss-transaction-api_1.1_spec 1.0.0.Final
- org.hibernate.javax.persistence -> hibernate-jpa-2.0-api 1.0.1.Final
- org.javassist -> javassist 3.15.0.GA
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,3 @@
-diff --git a/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java b/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java
-index b3e0dc5..2dfc933 100755
--- a/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java
@@ -111,10 +111,10 @@ public class EmptyInterceptor implements Interceptor, Serializable {
@@ -18,8 +16,6 @@ index b3e0dc5..2dfc933 100755
-}
\ No newline at end of file
+}
-diff --git a/hibernate-core/src/main/java/org/hibernate/Interceptor.java b/hibernate-core/src/main/java/org/hibernate/Interceptor.java
-index 7664c36..f935942 100644
--- a/hibernate-core/src/main/java/org/hibernate/Interceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/Interceptor.java
@@ -132,7 +132,7 @@ public interface Interceptor {
@@ -49,8 +45,6 @@ index 7664c36..f935942 100644
/**
* Called before a flush
-diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
-index cd4155f..bb4853f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
@@ -147,6 +147,27 @@ public abstract class AbstractFlushingEventListener implements Serializable {
@@ -2,5 +2,5 @@
Download Hibernate 4.1.0.Final source code, apply the patch, and build with gradle (tip use export GRADLE_OPTS=-Xmx1G -XX:MaxPermSize=512m)
----
-DRY RUN -> patch --dry-run -p0 -i hibernate-4.1.x.Final.patch
-APPLY -> patch -p0 -i hibernate-4.1.x.Final.patch
+DRY RUN -> patch --dry-run -p1 -i hibernate-4.1.x.Final.patch
+APPLY -> patch -p1 -i hibernate-4.1.x.Final.patch

0 comments on commit 6808407

Please sign in to comment.