From c1d5139c241483bfd4300eeb8ef7cf05017d63bb Mon Sep 17 00:00:00 2001
From: Adrien LAUER <adrien.lauer@gmail.com>
Date: Mon, 1 Apr 2019 16:21:13 +0200
Subject: [PATCH] Fix startup exception due to validation change

---
 CHANGELOG.md                                  |  4 +++
 checkstyle.xml                                |  2 +-
 core/pom.xml                                  | 12 ++++++---
 .../org/seedstack/mongodb/MongoDbConfig.java  |  2 +-
 .../internal/AbstractMongoDbManager.java      |  2 +-
 .../mongodb/internal/AsyncMongoDbManager.java |  2 +-
 .../mongodb/internal/MongoDbErrorCode.java    |  2 +-
 .../mongodb/internal/MongoDbManager.java      |  2 +-
 .../mongodb/internal/MongoDbModule.java       |  2 +-
 .../mongodb/internal/MongoDbPlugin.java       |  2 +-
 .../mongodb/internal/SyncMongoDbManager.java  |  2 +-
 .../mongodb/MongoDbConfig.properties          |  2 +-
 .../internal/MongoDbErrorCode.properties      |  2 +-
 .../org/seedstack/mongodb/MongoDbAsyncIT.java | 19 +++++++-------
 .../java/org/seedstack/mongodb/MongoDbIT.java | 17 ++++++------
 core/src/test/resources/application.yaml      |  2 +-
 morphia/pom.xml                               | 18 ++++++++++---
 .../morphia/BaseMorphiaRepository.java        |  2 +-
 .../seedstack/mongodb/morphia/Morphia.java    |  2 +-
 .../mongodb/morphia/MorphiaDatastore.java     |  2 +-
 .../morphia/internal/DatastoreFactory.java    |  2 +-
 .../morphia/internal/DatastoreImpl.java       |  2 +-
 .../morphia/internal/DatastoreProvider.java   |  2 +-
 .../internal/DefaultMorphiaRepository.java    |  2 +-
 .../morphia/internal/MorphiaErrorCode.java    |  2 +-
 .../morphia/internal/MorphiaModule.java       |  7 ++---
 .../morphia/internal/MorphiaPlugin.java       | 25 +++++++-----------
 .../internal/MorphiaSpecifications.java       |  2 +-
 .../morphia/internal/MorphiaUtils.java        |  2 +-
 ....java => ValidatingEntityInterceptor.java} | 23 +++++++---------
 .../specification/MorphiaAndConverter.java    |  2 +-
 .../MorphiaAttributeConverter.java            |  2 +-
 .../specification/MorphiaEqualConverter.java  |  2 +-
 .../specification/MorphiaFalseConverter.java  |  2 +-
 .../MorphiaGreaterThanConverter.java          |  2 +-
 .../MorphiaIdentityConverter.java             |  2 +-
 .../MorphiaLessThanConverter.java             |  2 +-
 .../specification/MorphiaNotConverter.java    |  2 +-
 .../specification/MorphiaOrConverter.java     |  2 +-
 .../MorphiaSpecificationTranslator.java       |  2 +-
 .../specification/MorphiaStringConverter.java |  2 +-
 .../MorphiaStringEqualConverter.java          |  2 +-
 .../MorphiaStringMatchingConverter.java       |  2 +-
 .../MorphiaTranslationContext.java            |  2 +-
 .../specification/MorphiaTrueConverter.java   |  2 +-
 .../internal/MorphiaErrorCode.properties      |  2 +-
 .../seedstack/mongodb/morphia/MorphiaIT.java  | 26 ++++++++++++-------
 .../mongodb/morphia/MorphiaRepositoryIT.java  | 17 ++++++------
 .../mongodb/morphia/SpecificationIT.java      |  4 +--
 .../morphia/fixtures/dummyobject/Dummy1.java  |  2 +-
 .../morphia/fixtures/dummyobject/Dummy2.java  |  2 +-
 .../morphia/fixtures/dummyobject/Dummy3.java  |  2 +-
 .../morphia/fixtures/dummyobject/Dummy4.java  |  2 +-
 .../morphia/fixtures/dummyobject/Dummy5.java  |  2 +-
 .../morphia/fixtures/dummyobject/Dummy6.java  |  2 +-
 .../morphia/fixtures/product/Picture.java     |  2 +-
 .../morphia/fixtures/product/PictureURL.java  |  2 +-
 .../morphia/fixtures/product/Product.java     |  2 +-
 .../morphia/fixtures/user/Address.java        |  2 +-
 .../mongodb/morphia/fixtures/user/User.java   |  2 +-
 morphia/src/test/resources/application.yaml   |  2 +-
 pom.xml                                       | 11 +++++---
 62 files changed, 154 insertions(+), 129 deletions(-)
 rename morphia/src/main/java/org/seedstack/mongodb/morphia/internal/{InternalValidationExtension.java => ValidatingEntityInterceptor.java} (59%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5637873..a5ee722 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 3.0.2 (2019-01-10)
+
+* [fix] Fix issue #11: an exception occurred at startup because the way of accessing the ValidationFactory changed. 
+
 # Version 3.0.1 (2019-01-10)
 
 * [fix] During translation of composite specifications (or, and), set the field for each member (avoid "No field has been set" exception).  
diff --git a/checkstyle.xml b/checkstyle.xml
index 547e414..cc4d78d 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/pom.xml b/core/pom.xml
index cd327ef..f4c2eb4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.2-SNAPSHOT</version>
     </parent>
 
 	<artifactId>mongodb-core</artifactId>
@@ -35,10 +35,16 @@
 
         <dependency>
             <groupId>org.seedstack.seed</groupId>
-            <artifactId>seed-testing</artifactId>
+            <artifactId>seed-testing-junit4</artifactId>
             <version>${seed.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
diff --git a/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java b/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java
index 2d759fa..bae0174 100644
--- a/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java
+++ b/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/AbstractMongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/AbstractMongoDbManager.java
index 7bf26f8..8635e73 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/AbstractMongoDbManager.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/AbstractMongoDbManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/AsyncMongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/AsyncMongoDbManager.java
index 601cc93..fb1842d 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/AsyncMongoDbManager.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/AsyncMongoDbManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java
index e320035..8845279 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
index a69817c..e826e17 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java
index 654da34..a5ffad9 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
index e221d91..3bafcf9 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/SyncMongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/SyncMongoDbManager.java
index 3c723ad..efa4378 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/SyncMongoDbManager.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/SyncMongoDbManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties b/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties
index c423259..5369960 100644
--- a/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties
+++ b/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties b/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties
index 615222e..cae3000 100644
--- a/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties
+++ b/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/test/java/org/seedstack/mongodb/MongoDbAsyncIT.java b/core/src/test/java/org/seedstack/mongodb/MongoDbAsyncIT.java
index 104e74d..9d99d32 100644
--- a/core/src/test/java/org/seedstack/mongodb/MongoDbAsyncIT.java
+++ b/core/src/test/java/org/seedstack/mongodb/MongoDbAsyncIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,20 +7,21 @@
  */
 package org.seedstack.mongodb;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.client.MongoClient;
 import com.mongodb.async.client.MongoDatabase;
-import org.bson.Document;
-import org.junit.Test;
-import org.seedstack.seed.it.AbstractSeedIT;
-
+import java.util.concurrent.atomic.AtomicBoolean;
 import javax.inject.Inject;
 import javax.inject.Named;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.bson.Document;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.seedstack.seed.testing.junit4.SeedITRunner;
 
-public class MongoDbAsyncIT extends AbstractSeedIT {
+@RunWith(SeedITRunner.class)
+public class MongoDbAsyncIT {
     @Inject
     @Named("client2")
     MongoClient client2;
diff --git a/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java b/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
index 37a46ad..cccc528 100644
--- a/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
+++ b/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,18 +7,19 @@
  */
 package org.seedstack.mongodb;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.mongodb.MongoClient;
 import com.mongodb.client.MongoDatabase;
-import org.bson.Document;
-import org.junit.Test;
-import org.seedstack.seed.it.AbstractSeedIT;
-
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.bson.Document;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.seedstack.seed.testing.junit4.SeedITRunner;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class MongoDbIT extends AbstractSeedIT {
+@RunWith(SeedITRunner.class)
+public class MongoDbIT {
     @Inject
     @Named("client1")
     MongoClient client1;
diff --git a/core/src/test/resources/application.yaml b/core/src/test/resources/application.yaml
index 119d74b..953dac0 100644
--- a/core/src/test/resources/application.yaml
+++ b/core/src/test/resources/application.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/pom.xml b/morphia/pom.xml
index eb40dbc..2407b4e 100644
--- a/morphia/pom.xml
+++ b/morphia/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>mongodb-morphia</artifactId>
@@ -54,16 +54,28 @@
 
         <dependency>
             <groupId>org.seedstack.seed</groupId>
-            <artifactId>seed-testing</artifactId>
+            <artifactId>seed-testing-junit4</artifactId>
             <version>${seed.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>${logback.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.13.Final</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongodb-driver-async</artifactId>
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
index 175c75b..c4c89d1 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java
index 47976a5..72c7b57 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java
index c4f082a..6c459a4 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
index e142292..827cc6a 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreImpl.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreImpl.java
index ec5e120..4a06819 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreImpl.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreProvider.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreProvider.java
index 061b153..8fca5c6 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreProvider.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DefaultMorphiaRepository.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DefaultMorphiaRepository.java
index 4750b8d..f4879c4 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DefaultMorphiaRepository.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DefaultMorphiaRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.java
index e259c70..70c9cf6 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java
index fee3ab6..7d44b89 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,17 +8,17 @@
 /**
  *
  */
+
 package org.seedstack.mongodb.morphia.internal;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Key;
 import com.google.inject.Scopes;
+import java.util.Collection;
 import org.mongodb.morphia.Datastore;
 import org.mongodb.morphia.Morphia;
 import org.seedstack.mongodb.morphia.MorphiaDatastore;
 
-import java.util.Collection;
-
 class MorphiaModule extends AbstractModule {
     private final Collection<MorphiaDatastore> morphiaDatastoresAnnotation;
     private final Morphia morphia;
@@ -40,5 +40,6 @@ protected void configure() {
                 bind(Key.get(Datastore.class, morphiaDatastore)).toProvider(datastoreProvider).in(Scopes.SINGLETON);
             }
         }
+        morphia.getMapper().getInterceptors().forEach(this::requestInjection);
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
index 987805b..bceff44 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,19 +11,17 @@
 import io.nuun.kernel.api.plugin.InitState;
 import io.nuun.kernel.api.plugin.context.InitContext;
 import io.nuun.kernel.api.plugin.request.ClasspathScanRequest;
+import java.util.Collection;
+import java.util.HashSet;
 import org.mongodb.morphia.Morphia;
 import org.seedstack.mongodb.morphia.MorphiaDatastore;
 import org.seedstack.seed.Application;
-import org.seedstack.seed.core.SeedRuntime;
 import org.seedstack.seed.core.internal.AbstractSeedPlugin;
+import org.seedstack.seed.core.internal.init.ValidationManager;
 import org.seedstack.seed.core.internal.validation.ValidationPlugin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.validation.ValidatorFactory;
-import java.util.Collection;
-import java.util.HashSet;
-
 /**
  * This plugin manages the MongoDb Morphia object/document mapping library.
  */
@@ -31,7 +29,6 @@ public class MorphiaPlugin extends AbstractSeedPlugin {
     private static final Logger LOGGER = LoggerFactory.getLogger(MorphiaPlugin.class);
     private final Collection<MorphiaDatastore> morphiaDatastores = new HashSet<>();
     private final Morphia morphia = new Morphia();
-    private ValidatorFactory validatorFactory;
 
     @Override
     public String name() {
@@ -50,19 +47,17 @@ public Collection<ClasspathScanRequest> classpathScanRequests() {
                 .build();
     }
 
-    @Override
-    protected void setup(SeedRuntime seedRuntime) {
-        validatorFactory = seedRuntime.getValidatorFactory();
-    }
-
     @Override
     public InitState initialize(InitContext initContext) {
         Application application = getApplication();
 
-        new InternalValidationExtension(validatorFactory, morphia);
-        LOGGER.debug("Validation is enabled on Morphia entities");
+        if (ValidationManager.get().getValidationLevel() != ValidationManager.ValidationLevel.NONE) {
+            LOGGER.info("Validation is enabled on Morphia entities");
+            morphia.getMapper().addInterceptor(new ValidatingEntityInterceptor());
+        }
 
-        Collection<Class<?>> morphiaScannedClasses = initContext.scannedTypesBySpecification().get(MorphiaSpecifications.PERSISTED_CLASSES);
+        Collection<Class<?>> morphiaScannedClasses = initContext.scannedTypesBySpecification()
+                .get(MorphiaSpecifications.PERSISTED_CLASSES);
         if (morphiaScannedClasses != null && !morphiaScannedClasses.isEmpty()) {
             morphia.map(new HashSet<>(morphiaScannedClasses));
             for (Class<?> morphiaClass : morphiaScannedClasses) {
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaSpecifications.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaSpecifications.java
index 4e91c68..6dad22f 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaSpecifications.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaSpecifications.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaUtils.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaUtils.java
index df6d533..284d58d 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaUtils.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/InternalValidationExtension.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java
similarity index 59%
rename from morphia/src/main/java/org/seedstack/mongodb/morphia/internal/InternalValidationExtension.java
rename to morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java
index a99e7ea..b039d4b 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/InternalValidationExtension.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,26 +8,21 @@
 package org.seedstack.mongodb.morphia.internal;
 
 import com.mongodb.DBObject;
+import java.util.Set;
+import javax.inject.Inject;
+import javax.validation.ConstraintViolation;
+import javax.validation.ValidatorFactory;
 import org.mongodb.morphia.AbstractEntityInterceptor;
-import org.mongodb.morphia.Morphia;
 import org.mongodb.morphia.mapping.Mapper;
 import org.seedstack.seed.core.internal.validation.VerboseConstraintViolationException;
 
-import javax.validation.ValidatorFactory;
-import java.util.Set;
-
-class InternalValidationExtension extends AbstractEntityInterceptor {
-    private final ValidatorFactory validatorFactory;
-
-    InternalValidationExtension(final ValidatorFactory validatorFactory, final Morphia morphia) {
-        this.validatorFactory = validatorFactory;
-        morphia.getMapper().addInterceptor(this);
-    }
+class ValidatingEntityInterceptor extends AbstractEntityInterceptor {
+    @Inject
+    private ValidatorFactory validatorFactory;
 
     @Override
-    @SuppressWarnings("unchecked")
     public void prePersist(final Object ent, final DBObject dbObj, final Mapper mapper) {
-        final Set result = validatorFactory.getValidator().validate(ent);
+        Set<ConstraintViolation<Object>> result = validatorFactory.getValidator().validate(ent);
         if (!result.isEmpty()) {
             throw new VerboseConstraintViolationException(result);
         }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java
index 88285b0..4847a01 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java
index b2a88f2..7931047 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java
index db3c3a8..ab43ee0 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java
index 524acef..796d21a 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java
index 52fed10..385e078 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java
index 389648a..9a77dcb 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java
index 7b1da97..f00caac 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java
index 4004a6e..966fc2e 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java
index 222ab8a..69edb40 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java
index 13ab975..9d59847 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java
index 08cc3db..6dd6ba6 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java
index 4a3e8e9..a5fe0ed 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java
index 5c7e595..cf8b120 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java
index 265bdb9..4e8c09a 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java
index 35ec328..9e2fe8f 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/resources/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.properties b/morphia/src/main/resources/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.properties
index 88f0994..2927990 100644
--- a/morphia/src/main/resources/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.properties
+++ b/morphia/src/main/resources/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaIT.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaIT.java
index 782607a..b73b503 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaIT.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,13 +7,18 @@
  */
 package org.seedstack.mongodb.morphia;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
+
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.ProvisionException;
 import com.google.inject.TypeLiteral;
 import com.google.inject.util.Types;
+import javax.validation.ConstraintViolationException;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mongodb.morphia.Datastore;
 import org.mongodb.morphia.Key;
 import org.seedstack.business.domain.Repository;
@@ -27,14 +32,10 @@
 import org.seedstack.mongodb.morphia.fixtures.user.User;
 import org.seedstack.mongodb.morphia.internal.MorphiaErrorCode;
 import org.seedstack.seed.SeedException;
-import org.seedstack.seed.it.AbstractSeedIT;
-
-import javax.validation.ConstraintViolationException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Fail.fail;
+import org.seedstack.seed.testing.junit4.SeedITRunner;
 
-public class MorphiaIT extends AbstractSeedIT {
+@RunWith(SeedITRunner.class)
+public class MorphiaIT {
     @Inject
     @MorphiaDatastore(clientName = "client1", dbName = "db")
     private Datastore datastore;
@@ -43,7 +44,10 @@ public class MorphiaIT extends AbstractSeedIT {
 
     @Test
     public void datastoreAccess() {
-        User user = new User(1L, "Gerard", "menvuça", new Address("France", "78300", "Poissy", "avenue de l'europe", 1));
+        User user = new User(1L,
+                "Gerard",
+                "menvuça",
+                new Address("France", "78300", "Poissy", "avenue de l'europe", 1));
         Key<User> keyUser = datastore.save(user);
         Assertions.assertThat(keyUser).isNotNull();
     }
@@ -66,7 +70,9 @@ public void repositoryInjectionTestNoClientForAggregate() {
     }
 
     private com.google.inject.Key<?> getMorphiaRepositoryOf(Class entity) {
-        return com.google.inject.Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, entity, Long.class)), Morphia.class);
+        return com.google.inject.Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class,
+                entity,
+                Long.class)), Morphia.class);
     }
 
     @Test
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java
index 38e77fe..8c91e5c 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,21 +7,22 @@
  */
 package org.seedstack.mongodb.morphia;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
 import com.google.inject.Inject;
+import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.seedstack.business.domain.AggregateNotFoundException;
 import org.seedstack.business.domain.Repository;
 import org.seedstack.mongodb.morphia.fixtures.user.Address;
 import org.seedstack.mongodb.morphia.fixtures.user.User;
-import org.seedstack.seed.it.AbstractSeedIT;
-
-import java.util.Optional;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import org.seedstack.seed.testing.junit4.SeedITRunner;
 
-public class MorphiaRepositoryIT extends AbstractSeedIT {
+@RunWith(SeedITRunner.class)
+public class MorphiaRepositoryIT {
     @Inject
     @Morphia
     private Repository<User, Long> userRepository;
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/SpecificationIT.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/SpecificationIT.java
index 219c4fb..23f7f1c 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/SpecificationIT.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/SpecificationIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24,7 +24,7 @@
 import org.seedstack.business.specification.dsl.SpecificationBuilder;
 import org.seedstack.mongodb.morphia.fixtures.product.Picture;
 import org.seedstack.mongodb.morphia.fixtures.product.Product;
-import org.seedstack.seed.it.SeedITRunner;
+import org.seedstack.seed.testing.junit4.SeedITRunner;
 
 @RunWith(SeedITRunner.class)
 public class SpecificationIT {
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy1.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy1.java
index 0a279e2..dbfb972 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy1.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy2.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy2.java
index d4b0a98..048917d 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy2.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy3.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy3.java
index 4195d4b..fd63b68 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy3.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy4.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy4.java
index ac380c2..13a7210 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy4.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy5.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy5.java
index 53a31c7..96163fd 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy5.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy6.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy6.java
index b8c85d0..a5f1590 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy6.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Picture.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Picture.java
index 71ffbc2..96e7da7 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Picture.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Picture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/PictureURL.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/PictureURL.java
index 176a579..9dfa5e3 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/PictureURL.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/PictureURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Product.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Product.java
index 9383d65..a1a2768 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Product.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Product.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/Address.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/Address.java
index 0199a78..236f73a 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/Address.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/Address.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/User.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/User.java
index 89e76a8..dd37641 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/User.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/resources/application.yaml b/morphia/src/test/resources/application.yaml
index e72c7c9..6b4f547 100644
--- a/morphia/src/test/resources/application.yaml
+++ b/morphia/src/test/resources/application.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/pom.xml b/pom.xml
index fd0a235..d0d68f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,16 +14,16 @@
     <parent>
         <groupId>org.seedstack.poms</groupId>
         <artifactId>parent-internal</artifactId>
-        <version>3.4.3</version>
+        <version>3.4.6</version>
     </parent>
 
     <groupId>org.seedstack.addons.mongodb</groupId>
     <artifactId>mongodb</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <seed.version>3.4.0</seed.version>
+        <seed.version>3.8.5</seed.version>
         <mongodb.version>3.0.3</mongodb.version>
         <morphia.version>1.3.2</morphia.version>
         <business.version>4.0.0</business.version>
@@ -63,10 +63,13 @@
                             <licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
                             <licenseMerge>Apache 2|Apache License, version 2.0</licenseMerge>
                             <licenseMerge>Apache 2|Apache License Version 2.0</licenseMerge>
+                            <licenseMerge>Apache 2|Apache 2.0</licenseMerge>
                             <licenseMerge>BSD|The New BSD License</licenseMerge>
                             <licenseMerge>BSD|https://svn.codehaus.org/proxytoys/trunk/LICENSE.txt</licenseMerge>                            
                             <licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
                             <licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
+                            <licenseMerge>MIT License|The MIT License</licenseMerge>
+                            <licenseMerge>MIT License|MIT license</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
                         </licenseMerges>