From 24c3f920308a7349391db889e50593ff55433a08 Mon Sep 17 00:00:00 2001 From: Misagh Moayyed Date: Thu, 8 Aug 2019 22:11:54 +0430 Subject: [PATCH] updated --- .github/renovate.json | 11 +++++++++++ .mergify.yml | 14 +++++++++++++- cas-client-core/pom.xml | 6 ++++++ pom.xml | 6 ++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 .github/renovate.json diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000..58fa77f --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,11 @@ +{ + "extends": [ + "config:base", + ":preserveSemverRanges", + ":rebaseStalePrs", + ":disableRateLimiting", + ":semanticCommits", + ":semanticCommitTypeAll(renovatebot)" + ], + "labels": ["dependencies", "bot"] +} diff --git a/.mergify.yml b/.mergify.yml index 4d35136..89b9196 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,4 +10,16 @@ pull_request_rules: merge: method: merge strict: true - delete_head_branch: \ No newline at end of file + delete_head_branch: +- name: automatic merge by renovate + conditions: + - status-success=continuous-integration/travis-ci/pr + - status-success=WIP + - "#changes-requested-reviews-by=0" + - base=master + - label=dependencies + actions: + merge: + method: merge + strict: true + delete_head_branch: diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml index 804644b..ff0e745 100644 --- a/cas-client-core/pom.xml +++ b/cas-client-core/pom.xml @@ -47,6 +47,12 @@ provided + + org.springframework + spring-web + provided + + org.springframework spring-test diff --git a/pom.xml b/pom.xml index a8e2bd4..baea5c3 100644 --- a/pom.xml +++ b/pom.xml @@ -185,6 +185,12 @@ ${spring.version} + + org.springframework + spring-web + ${spring.version} + + org.springframework spring-test