Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/maven/develop/org.apache.maven…
Browse files Browse the repository at this point in the history
….plugins-maven-release-plugin-3.0.1
  • Loading branch information
s-frei authored Nov 6, 2023
2 parents c68a969 + e1fb78b commit cbc00ca
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ updates:
timezone: "Europe/Berlin"
time: "06:00"
target-branch: "develop"
open-pull-requests-limit: 10
open-pull-requests-limit: 25
reviewers:
- "s-frei"
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: dependabot/fetch-metadata@v1

- name: "Enable auto-merge for Dependabot PRs"
if: ${{contains(steps.dependabot-metadata.outputs.dependency-names, 'rails') && steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch'}}
if: ${{steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch'}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
<!-- deps -->
<lombok.version>1.18.30</lombok.version>
<retrofit.version>2.9.0</retrofit.version>
<okhttp.version>4.11.0</okhttp.version>
<okhttp.version>4.12.0</okhttp.version>
<jackson-databind.version>2.15.3</jackson-databind.version>
<jsoup.version>1.16.1</jsoup.version>
<jsoup.version>1.16.2</jsoup.version>
<slf4j-api.version>2.0.7</slf4j-api.version>
<junit.version>5.10.1</junit.version>
<assertj-core.version>3.24.2</assertj-core.version>
<logback-classic.version>1.4.8</logback-classic.version>
<logback-classic.version>1.4.11</logback-classic.version>

<!-- test n report -->
<maven-surefire.version>3.2.1</maven-surefire.version>
Expand All @@ -60,7 +60,7 @@
<lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<maven-scm-provider-gitexe.version>2.0.1</maven-scm-provider-gitexe.version>
<maven-scm-api.version>2.0.1</maven-scm-api.version>
Expand Down

0 comments on commit cbc00ca

Please sign in to comment.