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..5d560a86281f 100644 --- a/json-modules/json/src/main/webapp/package.json +++ b/json-modules/json/src/main/webapp/package.json @@ -1,11 +1,11 @@ { - "name": "jsonforms-intro", - "description": "Introduction to JSONForms", - "version": "0.0.1", - "license": "MIT", - "dependencies": { - "typings": "0.6.5", - "jsonforms": "0.0.19", - "bootstrap": "3.3.6" - } -} \ No newline at end of file + "name": "jsonforms-intro", + "description": "Introduction to JSONForms", + "version": "0.0.1", + "license": "MIT", + "dependencies": { + "typings": "0.7.0", + "jsonforms": "0.0.20", + "bootstrap": "3.3.6" + } +} 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-security-modules/spring-security-web-persistent-login/pom.xml b/spring-security-modules/spring-security-web-persistent-login/pom.xml index beafc10ffd80..8378a5dbf95b 100644 --- a/spring-security-modules/spring-security-web-persistent-login/pom.xml +++ b/spring-security-modules/spring-security-web-persistent-login/pom.xml @@ -168,7 +168,7 @@ - 4.2.6.RELEASE + 5.4.11 9.4.1212 @@ -176,4 +176,4 @@ 1.5.10.RELEASE - \ No newline at end of file +