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/web-modules/dropwizard/pom.xml b/web-modules/dropwizard/pom.xml index 999aa5c805bf..4569f7dab45c 100644 --- a/web-modules/dropwizard/pom.xml +++ b/web-modules/dropwizard/pom.xml @@ -48,10 +48,8 @@ - - + + com.baeldung.dropwizard.introduction.IntroductionApplication @@ -63,7 +61,7 @@ - 2.0.0 + 2.1.5 \ No newline at end of file