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 85edf8b69a33..157de2e9b5fe 100644 --- a/libraries-data/pom.xml +++ b/libraries-data/pom.xml @@ -169,7 +169,7 @@ 2.3 3.1 1.2.2 - 3.3.1 + 3.4.0 2.4.0 2.9.1 1.1.1 @@ -180,4 +180,4 @@ 1.6.0.1 - \ No newline at end of file + diff --git a/spring-web-modules/spring-mvc-xml-2/pom.xml b/spring-web-modules/spring-mvc-xml-2/pom.xml index 5910823e9507..580458a0cd34 100644 --- a/spring-web-modules/spring-mvc-xml-2/pom.xml +++ b/spring-web-modules/spring-mvc-xml-2/pom.xml @@ -87,7 +87,7 @@ - 5.0.2.RELEASE + 5.2.23.RELEASE 1.5.10.RELEASE 5.1.40 4.4.5