Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Struts 7] Merge master to 7xx #833

Merged
merged 42 commits into from
Jan 5, 2024

Conversation

lukaszlenart
Copy link
Member

No description provided.

lukaszlenart and others added 30 commits December 17, 2023 16:14
Builds Struts 7 as part of the main pipeline
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.3 to 4.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@a8a3f3a...c7d193f)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](github/codeql-action@v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…codeql-action-3

Bump github/codeql-action from 2 to 3
Bumps org.apache.commons:commons-compress from 1.23.0 to 1.24.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
[WW-5373] Update JavaDoc CspReportAction.java
Co-authored-by: Sebastian Peters <sebastian.peters@gmail.com>
Co-authored-by: Sebastian Peters <sebastian.peters@gmail.com>
[WW-5362] Removes type attribute out of <s:script/> tag
…/upload-artifact-4.0.0

Bump actions/upload-artifact from 3.1.3 to 4.0.0
…ns-commons-compress-1.24.0

Bump org.apache.commons:commons-compress from 1.23.0 to 1.24.0
WW-5378 Add option to NOT fallback to context lookup when finding value on OgnlValueStack
WW-5381 Introduce RootAccessor interface for extension point
kusalk and others added 12 commits January 3, 2024 11:41
WW-5379 Implement alternative mechanism for Velocity directives to obtain ValueStack
WW-5352 Repackage ParametersInterceptor and related classes
# Conflicts:
#	core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java
WW-5381 Introduce extension point for CompoundRootAccessor
[WW-5383] Updates RegEx to excludes JARs by default
…-2024-01-04

# Conflicts:
#	Jenkinsfile
#	bundles/admin/src/main/resources/osgi/admin/shell.ftl
#	bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl
#	bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl
#	plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
@lukaszlenart lukaszlenart changed the base branch from master to release/struts-7-0-x January 4, 2024 09:29
Copy link

sonarqubecloud bot commented Jan 4, 2024

Quality Gate Failed Quality Gate failed

Failed conditions

0.0% Coverage on New Code (required ≥ 80%)

See analysis details on SonarCloud

Copy link
Member

@kusalk kusalk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lukaszlenart lukaszlenart merged commit 273eb1f into release/struts-7-0-x Jan 5, 2024
6 of 7 checks passed
@lukaszlenart lukaszlenart deleted the merge-master-to-7xx-2024-01-04 branch January 5, 2024 06:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants