diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 000000000000..fac2166e311e
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,7 @@
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions:
+      - "#approved-reviews-by>=1"
+    actions:
+      merge:
+        method: merge
diff --git a/json-modules/json/src/main/webapp/package.json b/json-modules/json/src/main/webapp/package.json
index 5dae00059373..f321fc1db53a 100644
--- a/json-modules/json/src/main/webapp/package.json
+++ b/json-modules/json/src/main/webapp/package.json
@@ -4,8 +4,8 @@
     "version": "0.0.1",
     "license": "MIT",
     "dependencies": {
-         "typings": "0.6.5",
-         "jsonforms": "0.0.19",
+         "typings": "0.7.0",
+         "jsonforms": "0.0.20",
          "bootstrap": "3.3.6"
      }
 }
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping-2/pom.xml b/persistence-modules/hibernate-mapping-2/pom.xml
index 5ecb9e8b73aa..6937e4b50ba1 100644
--- a/persistence-modules/hibernate-mapping-2/pom.xml
+++ b/persistence-modules/hibernate-mapping-2/pom.xml
@@ -75,7 +75,7 @@
     <properties>
         <!-- Spring -->
         <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
-        <org.springframework.data.version>1.10.6.RELEASE</org.springframework.data.version>
+        <org.springframework.data.version>1.11.11.RELEASE</org.springframework.data.version>
         <!-- persistence -->
         <hibernate.version>5.2.10.Final</hibernate.version>
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>