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/testing-modules/mockserver/pom.xml b/testing-modules/mockserver/pom.xml
index 3495ddb09d9d..d03e3a0f43ba 100644
--- a/testing-modules/mockserver/pom.xml
+++ b/testing-modules/mockserver/pom.xml
@@ -38,7 +38,7 @@
     </dependencies>
 
     <properties>
-        <mock-sever-netty-version>3.10.8</mock-sever-netty-version>
+        <mock-sever-netty-version>5.15.0</mock-sever-netty-version>
         <apche-http-version>4.4.1</apche-http-version>
     </properties>