diff --git a/spring-mvc-kotlin/pom.xml b/spring-mvc-kotlin/pom.xml
index 2d1dac5e29..28a5681c03 100644
--- a/spring-mvc-kotlin/pom.xml
+++ b/spring-mvc-kotlin/pom.xml
@@ -17,38 +17,64 @@
 
     <packaging>war</packaging>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hibernate.version>5.2.13.Final</hibernate.version>
+        <kotlin.version>1.2.21</kotlin.version>
+        <spring.version>4.3.10.RELEASE</spring.version>
+        <thymeleaf.version>3.0.7.RELEASE</thymeleaf.version>
+        <h2.version>1.4.196</h2.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
-            <version>1.1.4</version>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>4.3.10.RELEASE</version>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>4.3.10.RELEASE</version>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf</artifactId>
-            <version>3.0.7.RELEASE</version>
+            <version>${thymeleaf.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf-spring4</artifactId>
-            <version>3.0.7.RELEASE</version>
+            <version>${thymeleaf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-testing</artifactId>
+            <version>${hibernate.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>4.3.10.RELEASE</version>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -60,10 +86,11 @@
             <plugin>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <groupId>org.jetbrains.kotlin</groupId>
-                <version>1.1.4</version>
+                <version>${kotlin.version}</version>
                 <configuration>
                     <compilerPlugins>
                         <plugin>spring</plugin>
+                        <plugin>jpa</plugin>
                     </compilerPlugins>
                     <jvmTarget>1.8</jvmTarget>
                 </configuration>
@@ -87,7 +114,12 @@
                     <dependency>
                         <groupId>org.jetbrains.kotlin</groupId>
                         <artifactId>kotlin-maven-allopen</artifactId>
-                        <version>1.1.4-3</version>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-noarg</artifactId>
+                        <version>${kotlin.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/spring-mvc-kotlin/src/main/kotlin/com/baeldung/kotlin/jpa/Person.kt b/spring-mvc-kotlin/src/main/kotlin/com/baeldung/kotlin/jpa/Person.kt
new file mode 100644
index 0000000000..801bd1b0a5
--- /dev/null
+++ b/spring-mvc-kotlin/src/main/kotlin/com/baeldung/kotlin/jpa/Person.kt
@@ -0,0 +1,15 @@
+package com.baeldung.jpa
+
+import javax.persistence.Entity
+import javax.persistence.GeneratedValue
+import javax.persistence.GenerationType
+import javax.persistence.Id
+import javax.persistence.Table
+
+@Entity
+@Table(name = "person")
+data class Person(
+        @Id
+        @GeneratedValue(strategy = GenerationType.AUTO)
+        val id: Int,
+        val name: String)
\ No newline at end of file
diff --git a/spring-mvc-kotlin/src/test/kotlin/com/baeldung/kotlin/jpa/HibernateKotlinIntegrationTest.kt b/spring-mvc-kotlin/src/test/kotlin/com/baeldung/kotlin/jpa/HibernateKotlinIntegrationTest.kt
new file mode 100644
index 0000000000..8f54373406
--- /dev/null
+++ b/spring-mvc-kotlin/src/test/kotlin/com/baeldung/kotlin/jpa/HibernateKotlinIntegrationTest.kt
@@ -0,0 +1,44 @@
+package com.baeldung.kotlin.jpa
+
+import com.baeldung.jpa.Person
+import org.hibernate.cfg.Configuration
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase
+import org.hibernate.testing.transaction.TransactionUtil.doInHibernate
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import java.io.IOException
+import java.util.*
+
+
+class HibernateKotlinIntegrationTest : BaseCoreFunctionalTestCase() {
+
+    private val properties: Properties
+        @Throws(IOException::class)
+        get() {
+            val properties = Properties()
+            properties.load(javaClass.classLoader.getResourceAsStream("hibernate.properties"))
+            return properties
+        }
+
+    override fun getAnnotatedClasses(): Array<Class<*>> {
+        return arrayOf(Person::class.java)
+    }
+
+    override fun configure(configuration: Configuration) {
+        super.configure(configuration)
+        configuration.properties = properties
+    }
+
+    @Test
+    fun givenPerson_whenSaved_thenFound() {
+        val personToSave = Person(0, "John")
+        doInHibernate(({ this.sessionFactory() }), { session ->
+            session.persist(personToSave)
+            assertTrue(session.contains(personToSave))
+        })
+        doInHibernate(({ this.sessionFactory() }), { session ->
+            val personFound = session.find(Person::class.java, personToSave.id)
+            assertTrue(personToSave == personFound)
+        })
+    }
+}
\ No newline at end of file
diff --git a/spring-mvc-kotlin/src/test/resources/hibernate.properties b/spring-mvc-kotlin/src/test/resources/hibernate.properties
new file mode 100644
index 0000000000..7b8764637b
--- /dev/null
+++ b/spring-mvc-kotlin/src/test/resources/hibernate.properties
@@ -0,0 +1,9 @@
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1
+hibernate.connection.username=sa
+hibernate.connection.autocommit=true
+jdbc.password=
+
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+hibernate.show_sql=true
+hibernate.hbm2ddl.auto=create-drop
\ No newline at end of file