Browse files

Merge pull request #9 from sjbwylbs/master

update 'master' to use hibernate4 (and produce 'jackson-datatype-hibernate4'); already created "hibernate3" branch that builds 'jackson-datatype-hibernate3' module
  • Loading branch information...
2 parents 7a64bd8 + 5df7722 commit 480fc7d6ca8003a019726a18cdfe8dc7b1a91b50 @cowtowncoder cowtowncoder committed Mar 8, 2012
View
2 pom.xml
@@ -37,7 +37,7 @@ Hibernate (http://hibernate.org) version 3.x data types.
<!--
<hibernate.version>[3.5.0, 3.6.6]</hibernate.version>
-->
- <hibernate.version>3.6.6.Final</hibernate.version>
+ <hibernate.version>4.1.0.Final</hibernate.version>
</properties>
<!-- Licensing -->
View
4 src/main/java/com/fasterxml/jackson/datatype/hibernate/HibernateSerializers.java
@@ -2,8 +2,8 @@
import java.util.*;
-import org.hibernate.collection.PersistentCollection;
-import org.hibernate.collection.PersistentMap;
+import org.hibernate.collection.internal.PersistentMap;
+import org.hibernate.collection.spi.PersistentCollection;
import org.hibernate.proxy.HibernateProxy;
import com.fasterxml.jackson.databind.*;
View
3 src/main/java/com/fasterxml/jackson/datatype/hibernate/PersistentCollectionSerializer.java
@@ -2,7 +2,8 @@
import java.io.IOException;
-import org.hibernate.collection.PersistentCollection;
+import org.hibernate.collection.spi.PersistentCollection;
+
import com.fasterxml.jackson.core.*;

0 comments on commit 480fc7d

Please sign in to comment.