diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6a033ebc710f..e25d08ed068b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,7 +26,7 @@ updates: interval: 'daily' # Before cache workflow time: '23:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 labels: - 'theme: jhipster-internals' - 'theme: dependencies' @@ -59,7 +59,7 @@ updates: interval: 'daily' # Angular workflow is quite big. Give at least 2h interval. time: '03:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: angular' @@ -100,7 +100,7 @@ updates: schedule: interval: 'daily' time: '00:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: dependencies' @@ -112,7 +112,7 @@ updates: schedule: interval: 'daily' time: '07:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: front' @@ -137,7 +137,7 @@ updates: schedule: interval: 'daily' time: '01:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: react' @@ -171,7 +171,7 @@ updates: schedule: interval: 'daily' time: '02:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: vue' @@ -204,7 +204,7 @@ updates: schedule: interval: 'daily' time: '00:20' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: docker :whale:' @@ -220,7 +220,7 @@ updates: interval: 'daily' # Maven doesn't have many PRs, but it triggers every client workflow. Let 2h of interval. time: '05:00' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: java' @@ -231,7 +231,7 @@ updates: schedule: interval: 'daily' time: '08:00' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: java' @@ -253,7 +253,7 @@ updates: schedule: interval: 'weekly' time: '00:30' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 labels: - 'theme: github_actions' - 'theme: CI builds' diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml new file mode 100644 index 000000000000..6b48009ca061 --- /dev/null +++ b/.github/workflows/sync.yml @@ -0,0 +1,30 @@ +name: 'Sync' +on: + workflow_dispatch: + schedule: + - cron: '10 */2 * * *' + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: 'SETUP: Checkout generator-jhipster' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: 'Rebase' + run: | + git config --global user.email "marceloshima@gmail.com" + git config --global user.name "Marcelo Shima" + git remote add upstream https://github.com/jhipster/generator-jhipster.git + git remote -v + git fetch upstream main + git branch -va + git branch upstream-main upstream/main + git push origin upstream-main + git checkout main + git rebase upstream/main + git push -f origin + #git fetch origin upstream_main + #git checkout upstream_main + #git rebase upstream/main diff --git a/generators/spring-cache/resources/gradle/libs.versions.toml b/generators/spring-cache/resources/gradle/libs.versions.toml index 31e84a362621..f37637393e65 100644 --- a/generators/spring-cache/resources/gradle/libs.versions.toml +++ b/generators/spring-cache/resources/gradle/libs.versions.toml @@ -12,4 +12,4 @@ xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemca xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' } -redisson = { module = 'org.redisson:redisson', version = '3.32.0' } +redisson = { module = 'org.redisson:redisson', version = '3.33.0' }