Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 14:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,372 Commits 21 Branches 184 Tags
main
Commit Graph

188 Commits

Author SHA1 Message Date
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] 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] 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
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 6e9fa714cf Uses AND instead of OR to check Sonar prerequisites 2024-11-18 19:56:26 +01:00
Lukasz Lenart 58d4d700ef Skip Sonar scan on PRs created by Dependabot 2024-11-18 19:28:22 +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
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
dependabot[bot] cb08d18b5a Bump github/codeql-action from 3.27.0 to 3.27.1 
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](https://github.com/github/codeql-action/compare/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] <support@github.com>
 2024-11-11 01:45:38 +00:00
Kusal Kithul-Godage f55c404d21 Merge branch 'master' into 7.0.x/merge-master-2024-11-01 2024-11-01 15:55:35 +11:00
dependabot[bot] 3f74923099 Bump github/codeql-action from 3.26.13 to 3.27.0 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.13 to 3.27.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.26.13...v3.27.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-28 01:54:27 +00:00
dependabot[bot] d1695f7a4d Bump github/codeql-action from 3.26.12 to 3.26.13 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.12 to 3.26.13.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.26.12...v3.26.13)

---
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-10-21 01:29:19 +00:00
Lukasz Lenart 8dc652789a Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15 
# Conflicts:
#	core/src/main/java/org/apache/struts2/components/UIBean.java
#	plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java
#	pom.xml
 2024-10-15 07:36:23 +02:00
Lukasz Lenart 2eff2da4fd Merge pull request #1074 from apache/dependabot/github_actions/actions/upload-artifact-4.4.3 
Bump actions/upload-artifact from 4.4.0 to 4.4.3
 2024-10-14 07:24:46 +02:00
dependabot[bot] 3528b88327 Bump actions/upload-artifact from 4.4.0 to 4.4.3 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.0 to 4.4.3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/50769540e7f4bd5e21e526ee35c689e35e0d6874...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-14 01:45:55 +00:00
dependabot[bot] 3e04197ba7 Bump github/codeql-action from 3.26.8 to 3.26.12 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.8 to 3.26.12.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.26.8...v3.26.12)

---
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-10-14 01:45:53 +00:00
dependabot[bot] 3c71b2ed8c Bump github/codeql-action from 3.26.6 to 3.26.8 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.6 to 3.26.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.26.6...v3.26.8)

---
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-09-23 01:08:01 +00:00
Lukasz Lenart 9fa6dd96f6 Merge branch 'master' into merge/master-to-7xx-2024-09-01 2024-09-02 08:37:26 +02:00
Lukasz Lenart e74d21befb Merge pull request #1038 from apache/dependabot/github_actions/github/codeql-action-3.26.6 
Bump github/codeql-action from 3.26.2 to 3.26.6
 2024-09-02 08:18:20 +02:00
dependabot[bot] 00f0942449 Bump github/codeql-action from 3.26.2 to 3.26.6 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.2 to 3.26.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.26.2...v3.26.6)

---
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-09-02 01:21:36 +00:00
dependabot[bot] 8c7c39424f Bump actions/upload-artifact from 4.3.6 to 4.4.0 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.6 to 4.4.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/834a144ee995460fba8ed112a2fc961b36a5ec5a...50769540e7f4bd5e21e526ee35c689e35e0d6874)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-02 01:21:24 +00:00
dependabot[bot] 9765edf2ea Bump github/codeql-action from 3.26.0 to 3.26.2 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.0 to 3.26.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.26.0...v3.26.2)

---
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-08-19 01:52:03 +00:00
Lukasz Lenart 8bbe215b6a Merge pull request #1015 from apache/dependabot/github_actions/github/codeql-action-3.26.0 
Bump github/codeql-action from 3.25.15 to 3.26.0
 2024-08-12 07:41:31 +02:00
dependabot[bot] 107810dce2 Bump github/codeql-action from 3.25.15 to 3.26.0 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.15 to 3.26.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.25.15...v3.26.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-08-12 01:15:10 +00:00
dependabot[bot] 1536a7e04b Bump actions/upload-artifact from 4.3.5 to 4.3.6 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.5 to 4.3.6.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/89ef406dd8d7e03cfd12d9e0a4a378f454709029...834a144ee995460fba8ed112a2fc961b36a5ec5a)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-08-12 01:14:58 +00:00
Lukasz Lenart a4464099d9 Merge pull request #1006 from apache/dependabot/github_actions/ossf/scorecard-action-2.4.0 
Bump ossf/scorecard-action from 2.3.3 to 2.4.0
 2024-08-05 07:24:54 +02:00
Lukasz Lenart 9280a478c3 Merge pull request #1012 from apache/dependabot/github_actions/actions/upload-artifact-4.3.5 
Bump actions/upload-artifact from 4.3.4 to 4.3.5
 2024-08-05 07:22:30 +02:00
dependabot[bot] b8da13c235 Bump actions/upload-artifact from 4.3.4 to 4.3.5 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.4 to 4.3.5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/0b2256b8c012f0828dc542b3febcab082c67f72b...89ef406dd8d7e03cfd12d9e0a4a378f454709029)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-08-05 01:55:15 +00:00
dependabot[bot] 0d3358b035 Bump github/codeql-action from 2.22.11 to 3.25.15 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.11 to 3.25.15.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v2.22.11...v3.25.15)

---
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>
 2024-08-05 01:55:12 +00:00
dependabot[bot] eeb1d8e0ca Bump ossf/scorecard-action from 2.3.3 to 2.4.0 
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.3 to 2.4.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/dc50aa9510b46c811795eb24b2f1ba02a914e534...62b2cac7ed8198b15735ed49ab1e5cf35480ba46)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-29 01:44:54 +00:00
Kusal Kithul-Godage d995b1a85e Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-07-09 2024-07-09 05:45:36 +10:00
dependabot[bot] 7762d7fba2 Bump actions/upload-artifact from 4.3.3 to 4.3.4 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/65462800fd760344b1a7b4382951275a0abb4808...0b2256b8c012f0828dc542b3febcab082c67f72b)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-08 01:40:34 +00:00
Lukasz Lenart 28ea6d01c2 Merge branch 'master' into merge/master-2024-06-10 2024-06-10 07:30:59 +02:00
dependabot[bot] 039c5f8d42 Bump ossf/scorecard-action from 2.3.1 to 2.3.3 
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.1 to 2.3.3.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/0864cf19026789058feabb7e87baa5f140aac736...dc50aa9510b46c811795eb24b2f1ba02a914e534)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-13 01:38:25 +00:00
dependabot[bot] 2d9af47a90 Bump actions/upload-artifact from 4.3.2 to 4.3.3 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/1746f4ab65b179e0ea60a494b83293b640dd5bba...65462800fd760344b1a7b4382951275a0abb4808)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-29 01:46:50 +00:00
dependabot[bot] 856d98010a Bump actions/upload-artifact from 4.3.1 to 4.3.2 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/5d5d22a31266ced268874388b861e4b58bb5c2f3...1746f4ab65b179e0ea60a494b83293b640dd5bba)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-22 01:35:16 +00:00
Lukasz Lenart 45b06dd69c Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-16 
# Conflicts:
#	plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java
#	plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
#	plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
#	plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
#	plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
#	pom.xml
 2024-02-16 09:27:16 +01:00
dependabot[bot] e9eae281c3 Bump actions/upload-artifact from 4.3.0 to 4.3.1 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/26f96dfa697d77e81fd5907df203aa23a56210a8...5d5d22a31266ced268874388b861e4b58bb5c2f3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-12 01:53:45 +00:00
Lukasz Lenart 11d84a26c3 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-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
 2024-02-01 10:02:43 +01:00
dependabot[bot] 372aad2c6c Bump actions/upload-artifact from 4.2.0 to 4.3.0 
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](https://github.com/actions/upload-artifact/compare/694cdabd8bdb0f10b2cea11669e1bf5453eed0a6...26f96dfa697d77e81fd5907df203aa23a56210a8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-29 01:48:45 +00:00
Lukasz Lenart 2513fcb292 Stops running sonar.yml on forks 2024-01-24 17:28:52 +01:00
dependabot[bot] cde86457ab Bump actions/upload-artifact from 4.1.0 to 4.2.0 
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](https://github.com/actions/upload-artifact/compare/1eb3cb2b3e0f29609092a73eb033bb759a334595...694cdabd8bdb0f10b2cea11669e1bf5453eed0a6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 01:38:19 +00:00
Lukasz Lenart 13bf91bf31 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-20 
# Conflicts:
#	Jenkinsfile
#	core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java
#	core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
#	core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
#	plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
#	plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java
#	plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
#	plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java
#	plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java
 2024-01-20 09:29:05 +01:00
dependabot[bot] 686189c1b3 Bump actions/upload-artifact from 4.0.0 to 4.1.0 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/c7d193f32edcb7bfad88892161225aeda64e9392...1eb3cb2b3e0f29609092a73eb033bb759a334595)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-15 01:30:13 +00:00
Lukasz Lenart d8090ef9d8 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-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
 2024-01-04 10:21:52 +01:00