Merge master into 7.x.x 2024-11-29 #1134
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.0 to 3.27.1. - [Release notes](https://github.com/github/codeql-action/releases) - [Commits](github/codeql-action@v3.27.0...v3.27.1) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…/codeql-action-3.27.1 Bump github/codeql-action from 3.27.0 to 3.27.1
WW-5484 Marks the DWR plugin as deprecated
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.1 to 3.27.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Commits](github/codeql-action@v3.27.1...v3.27.4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
and add .gitattributes in case people don't have core.autocrlf set cmd: `mvn wrapper:wrapper -Dmaven=3.9.9`
…nd-wrapper-to-3.3.2 Upgrade maven to 3.9.9 and wrapper to 3.3.2
…/codeql-action-3.27.4 Bump github/codeql-action from 3.27.1 to 3.27.4
Always run Sonar scan against the master branch
Skip Sonar scan on PRs created by Dependabot
Uses AND instead of OR to check Sonar prerequisites
…-2024-11-29 # Conflicts: # apps/pom.xml # apps/rest-showcase/pom.xml # apps/showcase/pom.xml # assembly/pom.xml # bom/pom.xml # bundles/demo/pom.xml # bundles/pom.xml # core/pom.xml # jakarta/pom.xml # jakarta/velocity-tools-view-jakarta/pom.xml # plugins/async/pom.xml # plugins/bean-validation/pom.xml # plugins/cdi/pom.xml # plugins/config-browser/pom.xml # plugins/convention/pom.xml # plugins/dwr/README.md # plugins/embeddedjsp/pom.xml # plugins/gxp/pom.xml # plugins/jasperreports/pom.xml # plugins/javatemplates/pom.xml # plugins/jfreechart/pom.xml # plugins/json/pom.xml # plugins/junit/pom.xml # plugins/osgi/pom.xml # plugins/oval/pom.xml # plugins/pell-multipart/pom.xml # plugins/plexus/pom.xml # plugins/pom.xml # plugins/portlet-junit/pom.xml # plugins/portlet-mocks/pom.xml # plugins/portlet-tiles/pom.xml # plugins/portlet/pom.xml # plugins/rest/pom.xml # plugins/sitemesh/pom.xml # plugins/spring/pom.xml # plugins/testng/pom.xml # plugins/tiles/pom.xml # plugins/velocity/pom.xml # plugins/xslt/pom.xml # pom.xml
lukaszlenart
requested review from
kusalk,
rgielen,
aleksandr-m,
yasserzamani,
sdutry and
cnenning
sepe81
approved these changes
Nov 29, 2024
kusalk
approved these changes
Nov 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.