From 39d07d07e1d96b57d0ec9657bdbc9fc9beccaee4 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Wed, 4 Jul 2018 12:41:35 +0200
Subject: [PATCH] [#7490] Upgrade jOOQ-meta-extensions dependency to Hibernate
 5.3

---
 jOOQ-meta-extensions/pom.xml                                  | 4 ++--
 jOOQ-meta-extensions/src/main/java/module-info.java           | 4 ++--
 .../jooq/meta/extensions/jpa/AttributeConverterExtractor.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jOOQ-meta-extensions/pom.xml b/jOOQ-meta-extensions/pom.xml
index 538e1b4fdd..351e0779c8 100644
--- a/jOOQ-meta-extensions/pom.xml
+++ b/jOOQ-meta-extensions/pom.xml
@@ -55,12 +55,12 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>5.2.13.Final</version>
+            <version>5.3.1.Final</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>4.1.5.RELEASE</version>
+            <version>5.0.7.RELEASE</version>
         </dependency>
 
 
diff --git a/jOOQ-meta-extensions/src/main/java/module-info.java b/jOOQ-meta-extensions/src/main/java/module-info.java
index 7540a4e6ef..6b3f1e967a 100644
--- a/jOOQ-meta-extensions/src/main/java/module-info.java
+++ b/jOOQ-meta-extensions/src/main/java/module-info.java
@@ -6,8 +6,8 @@ module org.jooq.meta.extensions {
     requires org.jooq;
     requires org.jooq.meta;
 
-    requires hibernate.jpa;
-    requires hibernate.core;
+    requires java.persistence;
+    requires org.hibernate.orm.core;
     requires spring.beans;
     requires spring.context;
     requires spring.core;
diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/AttributeConverterExtractor.java b/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/AttributeConverterExtractor.java
index b4dca29ef6..3243a75e44 100644
--- a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/AttributeConverterExtractor.java
+++ b/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/AttributeConverterExtractor.java
@@ -119,7 +119,7 @@ final class AttributeConverterExtractor implements Integrator {
                 Type type = property.getValue().getType();
 
                 if (type instanceof AttributeConverterTypeAdapter) {
-                    AttributeConverter<?, ?> converter = ((AttributeConverterTypeAdapter<?>) type).getAttributeConverter();
+                    AttributeConverter<?, ?> converter = ((AttributeConverterTypeAdapter<?>) type).getAttributeConverter().getConverterBean().getBeanInstance();
                     Iterator<Column> columnIterator = property.getColumnIterator();
 
                     if (columnIterator.hasNext()) {