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/libraries-data/pom.xml b/libraries-data/pom.xml index 6ba48a9d66bc..2988ccdb4ffb 100644 --- a/libraries-data/pom.xml +++ b/libraries-data/pom.xml @@ -207,9 +207,6 @@ 2.3 3.1 1.2.2 - 3.3.1 - 2.14.0 - 2.9.1 2.9.1 1.1.1 1.5.0 @@ -220,4 +217,4 @@ 3.29.2-GA - \ No newline at end of file + diff --git a/logging-modules/log4j2/pom.xml b/logging-modules/log4j2/pom.xml index da2984442c56..be22b6a97360 100644 --- a/logging-modules/log4j2/pom.xml +++ b/logging-modules/log4j2/pom.xml @@ -80,11 +80,10 @@ - 2.9.0 2.19.0 yyyyMMddHHmmss - \ No newline at end of file +