Merge master into 7-0-x branch - 2024-02-01 #866
Merged
Conversation
This file contains 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
* `mvn wrapper:wrapper -Dmaven=3.9.6` * remove outdated MavenWrapperDownloader from takari * remove duplicate definition for maven-wrapper-plugin b/c it is already defined under pluginManagement (cherry picked from commit 54a7c70)
Upgrade maven to 3.9.6 and wrapper to 3.2.0 (cherry-pick from 7.x)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@1eb3cb2...694cdab) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…/upload-artifact-4.2.0 Bump actions/upload-artifact from 4.1.0 to 4.2.0
Fixes excluding Plexus container in OWASP scan
Drops JDK11 build and fixes duplicated steps
Small spelling and MD fixes (IntelliJ assisted)
Stops running sonar.yml on forks
[WW-5360] Introduces additional countStr & indexStr to allow to ignore conversion
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@694cdab...26f96df) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…/upload-artifact-4.3.0 Bump actions/upload-artifact from 4.2.0 to 4.3.0
…-2024-02-01 # Conflicts: # Jenkinsfile # core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java # core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java # pom.xml
|
/cc: @sepe81 |
|
kusalk
approved these changes
Feb 1, 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.