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/apache-libraries/pom.xml b/apache-libraries/pom.xml
index 3d788698650f..3765c46f0174 100644
--- a/apache-libraries/pom.xml
+++ b/apache-libraries/pom.xml
@@ -200,7 +200,7 @@
1.2.0
3.10.0
1.2.1
- 1.2.1
+ 1.2.15
1.2.1
1.8.4
2.1.1-incubating
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