This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 04893b28b449741be53519ac3221aa3bec8d533b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 23 10:41:10 2024 -0500
Bump github/codeql-action from 3.27.9 to 3.28.0 (#2205)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from
3.27.9 to 3.28.0.
- [Release notes](https://github.com/github/codeql-action/releases)
-
[Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/github/codeql-action/compare/df409f7d9260372bd5f19e5b04e83cb3c43714ae...48ab28a6f5dbc2a99bf1e0131198dd8f1df78169)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 91602cfe88280e49a0cd45f9628f908d4975a695)
# Conflicts:
# .github/workflows/scorecards.yml
(cherry picked from commit 25d5332d1a6f9440b84a43b0687987d5de988cf5)
(cherry picked from commit 47bbbcd630c79508d6c29dc3eb61333ac136148b)
# Conflicts:
# .github/workflows/codeql-analysis.yml
---
.github/workflows/codeql-analysis.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index c8fb9479d1..13366b61af 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -54,7 +54,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195
# v3.27.6
+ uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
# v3.28.0
with:
languages: ${{ matrix.language }}
#config-file: ./.github/codeql/codeql-cxf-config.yml
@@ -82,4 +82,8 @@ jobs:
# make release
- name: Perform CodeQL Analysis
+<<<<<<< HEAD
uses:
github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+=======
+ uses:
github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
+>>>>>>> 47bbbcd630 (Bump github/codeql-action from 3.27.9 to 3.28.0 (#2205))
