Commit Graph

7806 Commits

Author SHA1 Message Date
Lukasz Lenart 1d95543fbf [maven-release-plugin] prepare release STRUTS_7_0_0 STRUTS_7_0_0 2024-12-11 07:56:16 +01:00
Lukasz Lenart 2ca44233f8 Merge pull request #1139 from apache/dependabot/maven/log4j2.version-2.24.2
Bump log4j2.version from 2.24.1 to 2.24.2
2024-12-10 18:58:09 +01:00
Lukasz Lenart 65d3abd6dc Merge pull request #1146 from apache/fix/WW-5405-build-status
WW-5405 Uses proper links to build statuses
2024-12-10 18:57:43 +01:00
Lukasz Lenart 73142943b6 Merge pull request #1144 from apache/dependabot/maven/com.thoughtworks.xstream-xstream-1.4.21
Bump com.thoughtworks.xstream:xstream from 1.4.20 to 1.4.21
2024-12-10 18:38:43 +01:00
Lukasz Lenart 4caea35f17 Merge pull request #1143 from apache/dependabot/github_actions/actions/setup-java-4
Bump actions/setup-java from 3 to 4
2024-12-10 18:38:15 +01:00
Lukasz Lenart 766b58ba28 Merge pull request #1138 from apache/dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.8.1
Bump org.apache.maven.plugins:maven-dependency-plugin from 3.8.0 to 3.8.1
2024-12-10 18:37:52 +01:00
Lukasz Lenart 182102150e Merge pull request #1137 from apache/fix/generics
NOJIRA Uses proper filed declarations and fixes generics
2024-12-10 18:37:29 +01:00
Lukasz Lenart fc34b36524 Merge pull request #1145 from apache/dependabot/github_actions/github/codeql-action-3.27.7
Bump github/codeql-action from 3.27.5 to 3.27.7
2024-12-10 18:27:22 +01:00
Lukasz Lenart 359c409129 WW-5405 Fixes typo in scope name 2024-12-10 18:00:49 +01:00
Lukasz Lenart 122af0f2ac WW-5405 Uses proper links to build statuses 2024-12-10 17:58:46 +01:00
Lukasz Lenart 0e03a220ac Merge pull request #1136 from apache/feature/WW-5405-main
WW-5405 Prepares to rename master branch into main
2024-12-10 17:41:40 +01:00
Lukasz Lenart 9bd89111f7 WW-5405 Updates to use the main branch instead of master 2024-12-10 17:23:26 +01:00
dependabot[bot] 1549708f34 Bump github/codeql-action from 3.27.5 to 3.27.7
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.5 to 3.27.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.27.5...v3.27.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-10 14:37:36 +00:00
dependabot[bot] 29b372902d Bump com.thoughtworks.xstream:xstream from 1.4.20 to 1.4.21
Bumps [com.thoughtworks.xstream:xstream](https://github.com/x-stream/xstream) from 1.4.20 to 1.4.21.
- [Release notes](https://github.com/x-stream/xstream/releases)
- [Commits](https://github.com/x-stream/xstream/commits)

---
updated-dependencies:
- dependency-name: com.thoughtworks.xstream:xstream
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-10 14:37:26 +00:00
dependabot[bot] 8666e326b6 Bump actions/setup-java from 3 to 4
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-09 01:28:46 +00:00
dependabot[bot] 4b64f32b69 Bump log4j2.version from 2.24.1 to 2.24.2
Bumps `log4j2.version` from 2.24.1 to 2.24.2.

Updates `org.apache.logging.log4j:log4j-api` from 2.24.1 to 2.24.2

Updates `org.apache.logging.log4j:log4j-core` from 2.24.1 to 2.24.2

Updates `org.apache.logging.log4j:log4j-jcl` from 2.24.1 to 2.24.2

Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.24.1 to 2.24.2

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.logging.log4j:log4j-jcl
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.apache.logging.log4j:log4j-slf4j-impl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 01:32:20 +00:00
dependabot[bot] 9fcc2d2942 Bump org.apache.maven.plugins:maven-dependency-plugin
Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.8.0...maven-dependency-plugin-3.8.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 01:32:14 +00:00
Lukasz Lenart 337da2d771 NOJIRA Uses proper filed declarations and fixes generics 2024-11-30 15:32:45 +01:00
Lukasz Lenart bc03f9a71e Merge pull request #1122 from apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.8.0
Bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.7.0 to 3.8.0
2024-11-30 11:27:28 +01:00
Lukasz Lenart f5ab26d4e9 Merge pull request #1135 from apache/dependabot/maven/jackson.version-2.18.2
Bump jackson.version from 2.18.0 to 2.18.2
2024-11-30 11:27:05 +01:00
Lukasz Lenart c1cd955929 Merge pull request #1132 from apache/dependabot/github_actions/github/codeql-action-3.27.5
Bump github/codeql-action from 3.27.4 to 3.27.5
2024-11-30 11:26:28 +01:00
Lukasz Lenart 9e0ff2a629 Merge pull request #1121 from apache/dependabot/maven/maven-surefire-plugin.version-3.5.2
Bump maven-surefire-plugin.version from 3.5.1 to 3.5.2
2024-11-30 11:26:05 +01:00
dependabot[bot] 723045babf Bump github/codeql-action from 3.27.4 to 3.27.5
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.4 to 3.27.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.27.4...v3.27.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-30 07:56:22 +00:00
dependabot[bot] 900fa46043 Bump jackson.version from 2.18.0 to 2.18.2
Bumps `jackson.version` from 2.18.0 to 2.18.2.

Updates `com.fasterxml.jackson.core:jackson-core` from 2.18.0 to 2.18.2
- [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.18.0...jackson-core-2.18.2)

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.0 to 2.18.2
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-xml` from 2.18.0 to 2.18.2
- [Commits](https://github.com/FasterXML/jackson-dataformat-xml/compare/jackson-dataformat-xml-2.18.0...jackson-dataformat-xml-2.18.2)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-30 07:56:12 +00:00
dependabot[bot] 4f6bda029a Bump maven-surefire-plugin.version from 3.5.1 to 3.5.2
Bumps `maven-surefire-plugin.version` from 3.5.1 to 3.5.2.

Updates `org.apache.maven.surefire:surefire-junit47` from 3.5.1 to 3.5.2

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.1 to 3.5.2
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.surefire:surefire-junit47
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-30 07:56:04 +00:00
Lukasz Lenart 5f35af0e13 Merge pull request #792 from apache/release/struts-7-0-x
Struts 7.0.x
2024-11-30 08:55:09 +01:00
Lukasz Lenart c16ab0d861 Merge pull request #1134 from apache/merge/master-to-7xx-2024-11-29
Merge master into 7.x.x 2024-11-29
2024-11-30 08:26:42 +01:00
Lukasz Lenart 61000681b8 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-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
2024-11-29 19:57:34 +01:00
Lukasz Lenart b3e07474eb Merge pull request #1131 from apache/fix/sonar-scan-and
Uses AND instead of OR to check Sonar prerequisites
2024-11-19 06:41:31 +01:00
Lukasz Lenart 6e9fa714cf Uses AND instead of OR to check Sonar prerequisites 2024-11-18 19:56:26 +01:00
Lukasz Lenart d6b015f623 Merge pull request #1130 from apache/fix/sonar-dependabot
Skip Sonar scan on PRs created by Dependabot
2024-11-18 19:50:28 +01:00
Lukasz Lenart 58d4d700ef Skip Sonar scan on PRs created by Dependabot 2024-11-18 19:28:22 +01:00
Lukasz Lenart b3807b191d Merge pull request #921 from apache/fix/sonar
Always run Sonar scan against the master branch
2024-11-18 19:09:16 +01:00
Lukasz Lenart c009a4ad1e Avoids running Sonar scan in forks 2024-11-18 16:06:58 +01:00
Lukasz Lenart b1d7c09d02 Uses Java 21 when running Sonar check 2024-11-18 12:36:28 +01:00
Lukasz Lenart 55885bc869 Runs Sonar step in case of running on master or PR 2024-11-18 12:34:53 +01:00
Lukasz Lenart 2e431df6b2 Always run Sonar scan against the master branch 2024-11-18 12:20:21 +01:00
Lukasz Lenart 780280aae1 Merge pull request #1128 from apache/dependabot/github_actions/github/codeql-action-3.27.4
Bump github/codeql-action from 3.27.1 to 3.27.4
2024-11-18 10:18:09 +01:00
Lukasz Lenart 3b7a4d828f Merge pull request #1129 from sepe81/feature/Upgrade-maven-to-3.9.9-and-wrapper-to-3.3.2
Upgrade maven to 3.9.9 and wrapper to 3.3.2
2024-11-18 09:34:02 +01:00
Sebastian Peters c8ab6ff64c Upgrade maven to 3.9.9 and wrapper to 3.3.2
and add .gitattributes in case people don't have core.autocrlf set

cmd: `mvn wrapper:wrapper -Dmaven=3.9.9`
2024-11-18 08:30:40 +01:00
Sebastian Peters 8b9d61cdd4 Add .gitattributes in case people don't have core.autocrlf set 2024-11-18 08:30:30 +01:00
dependabot[bot] b6d9dc9ecd Bump github/codeql-action from 3.27.1 to 3.27.4
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](https://github.com/github/codeql-action/compare/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] <support@github.com>
2024-11-18 01:32:24 +00:00
Lukasz Lenart 085f50d45a [maven-release-plugin] prepare for next development iteration 2024-11-17 10:57:21 +01:00
Lukasz Lenart 1f5305c249 [maven-release-plugin] prepare release STRUTS_6_7_0 STRUTS_6_7_0 2024-11-17 10:57:09 +01:00
Lukasz Lenart 9b2d6a23e0 Merge pull request #1127 from apache/feature/WW-5463-servlet-path
WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH
2024-11-17 10:23:55 +01:00
Lukasz Lenart 24c0e5f640 WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH 2024-11-15 08:52:36 +01:00
Lukasz Lenart 1903e0ef33 Merge pull request #1126 from apache/feature/WW-5484-dwr
WW-5484 Marks the DWR plugin as deprecated
2024-11-14 15:55:01 +01:00
Lukasz Lenart 08f664c0ed Merge pull request #1123 from apache/fix/WW-5486-request-params
WW-5486 Fixes exposing params added by ServletDispatcherResult
2024-11-13 10:13:42 +01:00
Lukasz Lenart a49b5a3616 WW-5486 Removes try-catches 2024-11-13 09:59:52 +01:00
Lukasz Lenart cf260074df WW-5486 Simplifies test to avoid using mocks 2024-11-13 09:52:14 +01:00