Test new merge-dependabot-reusable workflow

apache · Jan 8, 2024 · 5a6360a · 5a6360a
1 parent 91ee18c
commit 5a6360a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/merge-dependabot.yaml b/.github/workflows/merge-dependabot.yaml
@@ -30,11 +30,11 @@ jobs:
 
   build:
     if: github.repository == 'apache/logging-log4j-jakarta' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@e06e488e3adf5712dd7001f8b50248ca6ecf3600 # 10.4.0
+    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
 
   merge-dependabot:
     needs: build
-    uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e06e488e3adf5712dd7001f8b50248ca6ecf3600 # 10.4.0
+    uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
     permissions:
       contents: write                                       # to push changelog commits
       pull-requests: write                                  # to close the PR

diff --git a/log4j-jakarta-parent/pom.xml b/log4j-jakarta-parent/pom.xml
@@ -58,7 +58,7 @@
     <junit.version>5.10.1</junit.version>
     <log4j.version>3.0.0-SNAPSHOT</log4j.version>
     <mockito.version>5.8.0</mockito.version>
-    <spring-framework.version>6.1.2</spring-framework.version>
+    <spring-framework.version>6.1.0</spring-framework.version>
     <jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
     <jakarta.mail-api.version>2.1.2</jakarta.mail-api.version>
   </properties>