(struts) branch feature/WW-5405-main created (now ac270a8ab)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch feature/WW-5405-main
in repository https://gitbox.apache.org/repos/asf/struts.git


  at ac270a8ab WW-5405 Prepares to rename master branch into main

This branch includes the following new commits:

 new ac270a8ab WW-5405 Prepares to rename master branch into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(struts) 01/01: WW-5405 Prepares to rename master branch into main

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch feature/WW-5405-main
in repository https://gitbox.apache.org/repos/asf/struts.git

commit ac270a8ab9b5a80cad672970b8722ee4bb1f7375
Author: Lukasz Lenart 
AuthorDate: Sat Nov 30 09:37:27 2024 +0100

WW-5405 Prepares to rename master branch into main
---
 .asf.yaml  | 16 
 .github/workflows/codeql.yml   |  5 +++--
 .github/workflows/maven.yml|  5 +++--
 .github/workflows/scorecards-analysis.yaml |  3 ++-
 .github/workflows/sonar.yml|  6 +++---
 Jenkinsfile|  9 -
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 5e259c710..b2778fa2b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -21,6 +21,22 @@ github:
 # it does not work because our github teams are private/secret, see 
INFRA-25666
 require_code_owner_reviews: false
 required_approving_review_count: 0
+main:
+  # contexts are the names of checks that must pass.
+  contexts:
+- build
+  required_pull_request_reviews:
+# it does not work because our github teams are private/secret, see 
INFRA-25666
+require_code_owner_reviews: false
+required_approving_review_count: 0
+release/*:
+  # contexts are the names of checks that must pass.
+  contexts:
+- build
+  required_pull_request_reviews:
+# it does not work because our github teams are private/secret, see 
INFRA-25666
+require_code_owner_reviews: false
+required_approving_review_count: 0
   autolink_jira:
 - WW
   dependabot_alerts:  true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 23c804ec7..5dd7ebc8f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,8 +18,9 @@ name: "CodeQL"
 on:
   push:
 branches:
-  - master
-  - release/struts-7-0-x
+  - 'master'
+  - 'main'
+  - 'release/*'
   pull_request:
 
 permissions:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1e03eb8c7..5f4493f99 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,8 +19,9 @@ on:
   pull_request:
   push:
 branches:
-  - master
-  - release/struts-7-0-x
+  - 'master'
+  - 'main'
+  - 'release/*'
 
 permissions: read-all
 
diff --git a/.github/workflows/scorecards-analysis.yaml 
b/.github/workflows/scorecards-analysis.yaml
index 2480a7f39..0c4ba6ca6 100644
--- a/.github/workflows/scorecards-analysis.yaml
+++ b/.github/workflows/scorecards-analysis.yaml
@@ -21,7 +21,8 @@ on:
 - cron: "30 1 * * 6"# Weekly on Saturdays
   push:
 branches:
-  - master
+  - "master"
+  - "main"
 
 permissions: read-all
 
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index d04c72d10..f549e6297 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -19,8 +19,8 @@ on:
   pull_request:
   push:
 branches:
-  - master
-  - release/struts-7-0-x
+  - 'master'
+  - 'main'
 
 permissions: read-all
 
@@ -45,5 +45,5 @@ jobs:
   - env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-if: ${{ github.ref == 'master' || github.base_ref == 'master' }}
+if: ${{ github.ref == 'master' || github.base_ref == 'master' || 
github.ref == 'main' || github.base_ref == 'main' }}
 run: ./mvnw -B verify 
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar 
-Dsonar.branch.name=master -Pcoverage -DskipAssembly
diff --git a/Jenkinsfile b/Jenkinsfile
index 45cd77441..4f98808ca 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -81,7 +81,7 @@ pipeline {
 stage('Code Quality') {
   when {
 anyOf {
-  branch 'master'; branch 'release/struts-7-0-x'
+  branch 'master'; branch 'main'
 }
   }
   steps {
@@ -93,7 +93,7 @@ pipeline {
 stage('Build Source & JavaDoc') {
   when {
 anyOf {
-  branch 'master'; branch 'release/struts-7-0-x'
+  branch 'master'; branch 'main'
 }
   }
   steps {
@@ -106,7 +106,7 @@ pipeline {
 stage('Deploy Snapshot') {
   when {
 anyOf {
-  branch 'master'; branch 'release/struts-7-0-x'
+  branch 'master'; branch 'main'
 }
   }
   steps {
@@ -118,8 +118,7 @@ pipeline {
 stage('Upload nightlies') {
   when {
 anyOf {
-  branch 'master'
-  branch 'release/struts-7-0-x'
+  branch 'master'; branch 'main'
 }
   }
   steps {

(struts) 01/01: WW-5405 Prepares to rename master branch into main

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch feature/WW-5405-main
in repository https://gitbox.apache.org/repos/asf/struts.git

commit f475c17af12cef51fd3132f9721b69333b4a34c4
Author: Lukasz Lenart 
AuthorDate: Sat Nov 30 09:37:27 2024 +0100

WW-5405 Prepares to rename master branch into main
---
 .asf.yaml  | 16 +
 .github/workflows/codeql.yml   |  5 ++--
 .github/workflows/maven.yml|  5 ++--
 .github/workflows/scorecards-analysis.yaml |  3 ++-
 .github/workflows/sonar.yml|  9 +++
 Jenkinsfile| 38 --
 6 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 5e259c710..b2778fa2b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -21,6 +21,22 @@ github:
 # it does not work because our github teams are private/secret, see 
INFRA-25666
 require_code_owner_reviews: false
 required_approving_review_count: 0
+main:
+  # contexts are the names of checks that must pass.
+  contexts:
+- build
+  required_pull_request_reviews:
+# it does not work because our github teams are private/secret, see 
INFRA-25666
+require_code_owner_reviews: false
+required_approving_review_count: 0
+release/*:
+  # contexts are the names of checks that must pass.
+  contexts:
+- build
+  required_pull_request_reviews:
+# it does not work because our github teams are private/secret, see 
INFRA-25666
+require_code_owner_reviews: false
+required_approving_review_count: 0
   autolink_jira:
 - WW
   dependabot_alerts:  true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 23c804ec7..5dd7ebc8f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,8 +18,9 @@ name: "CodeQL"
 on:
   push:
 branches:
-  - master
-  - release/struts-7-0-x
+  - 'master'
+  - 'main'
+  - 'release/*'
   pull_request:
 
 permissions:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1e03eb8c7..5f4493f99 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,8 +19,9 @@ on:
   pull_request:
   push:
 branches:
-  - master
-  - release/struts-7-0-x
+  - 'master'
+  - 'main'
+  - 'release/*'
 
 permissions: read-all
 
diff --git a/.github/workflows/scorecards-analysis.yaml 
b/.github/workflows/scorecards-analysis.yaml
index 2480a7f39..0c4ba6ca6 100644
--- a/.github/workflows/scorecards-analysis.yaml
+++ b/.github/workflows/scorecards-analysis.yaml
@@ -21,7 +21,8 @@ on:
 - cron: "30 1 * * 6"# Weekly on Saturdays
   push:
 branches:
-  - master
+  - "master"
+  - "main"
 
 permissions: read-all
 
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index d04c72d10..58746571d 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -19,8 +19,8 @@ on:
   pull_request:
   push:
 branches:
-  - master
-  - release/struts-7-0-x
+  - 'master'
+  - 'main'
 
 permissions: read-all
 
@@ -45,5 +45,6 @@ jobs:
   - env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-if: ${{ github.ref == 'master' || github.base_ref == 'master' }}
-run: ./mvnw -B verify 
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar 
-Dsonar.branch.name=master -Pcoverage -DskipAssembly
+  MAIN_BRANCH: ${{ github.ref || github.base_ref || github.ref || 
github.base_ref }}
+if: ${{ github.ref == 'master' || github.base_ref == 'master' || 
github.ref == 'main' || github.base_ref == 'main' }}
+run: ./mvnw -B verify 
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.branch.name=${{ 
envs.MAIN_BRANCH }} -Pcoverage -DskipAssembly
diff --git a/Jenkinsfile b/Jenkinsfile
index 45cd77441..2a8b97137 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
   stages {
 stage('Test') {
   steps {
-sh './mvnw -B -DskipAssembly verify --no-transfer-progress'
+sh './mvnw -B -DskipAssembly verify'
   }
   post {
 always {
@@ -64,12 +64,17 @@ pipeline {
 maven 'maven_3_latest'
   }
   environment {
-MAVEN_OPTS = "-Xmx1024m"
+MAVEN_OPTS = "-Xmx2048m"
   }
   stages {
-stage('Test & Coverage') {
+stage('Install') {
   steps {
-sh './mvnw -B verify -Pcoverage -DskipAssembly 
--no-transfer-progress'
+sh './mvnw -B install -DskipTests -DskipAssembly'
+  }
+}
+stage('Test') {
+  steps {
+sh './mvnw -B verify -Pcoverage -DskipAssembly'
   }
   post {
 always {
@@ -78,52 +83,

(struts) branch feature/WW-5405-main updated (a8f979f7d -> f475c17af)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch feature/WW-5405-main
in repository https://gitbox.apache.org/repos/asf/struts.git


 discard a8f979f7d WW-5405 Prepares to rename master branch into main
 new f475c17af WW-5405 Prepares to rename master branch into main

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a8f979f7d)
\
 N -- N -- N   refs/heads/feature/WW-5405-main (f475c17af)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Jenkinsfile | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(struts) branch dependabot/maven/maven-surefire-plugin.version-3.5.2 deleted (was 4f6bda029)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch 
dependabot/maven/maven-surefire-plugin.version-3.5.2
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 4f6bda029 Bump maven-surefire-plugin.version from 3.5.1 to 3.5.2

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(struts) branch master updated (c1cd95592 -> f5ab26d4e)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


from c1cd95592 Merge pull request #1132 from 
apache/dependabot/github_actions/github/codeql-action-3.27.5
 add 900fa4604 Bump jackson.version from 2.18.0 to 2.18.2
 new f5ab26d4e Merge pull request #1135 from 
apache/dependabot/maven/jackson.version-2.18.2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch dependabot/maven/jackson.version-2.18.2 deleted (was 900fa4604)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch dependabot/maven/jackson.version-2.18.2
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 900fa4604 Bump jackson.version from 2.18.0 to 2.18.2

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(struts) 01/01: Merge pull request #1135 from apache/dependabot/maven/jackson.version-2.18.2

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit f5ab26d4e9218af99e915c3bdeef85d2bab9a6ff
Merge: c1cd95592 900fa4604
Author: Lukasz Lenart 
AuthorDate: Sat Nov 30 11:27:05 2024 +0100

Merge pull request #1135 from apache/dependabot/maven/jackson.version-2.18.2

Bump jackson.version from 2.18.0 to 2.18.2

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc pom.xml
index cdde5f89b,348556f3c..e2759284d
--- a/pom.xml
+++ b/pom.xml
@@@ -114,9 -114,9 +114,9 @@@
  1.14.11
  2.3.33
  8.0.1.Final
- 2.18.0
+ 2.18.2
  2.24.1
 -3.5.1
 +3.5.2
  5.8.0
  3.3.5
  2.0.16

(struts) branch master updated (9e0ff2a62 -> c1cd95592)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


from 9e0ff2a62 Merge pull request #1121 from 
apache/dependabot/maven/maven-surefire-plugin.version-3.5.2
 add 723045bab Bump github/codeql-action from 3.27.4 to 3.27.5
 new c1cd95592 Merge pull request #1132 from 
apache/dependabot/github_actions/github/codeql-action-3.27.5

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/codeql.yml   | 6 +++---
 .github/workflows/scorecards-analysis.yaml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(struts) 01/01: Merge pull request #1132 from apache/dependabot/github_actions/github/codeql-action-3.27.5

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit c1cd95592923ae984b7b1e503d8e70657d476498
Merge: 9e0ff2a62 723045bab
Author: Lukasz Lenart 
AuthorDate: Sat Nov 30 11:26:28 2024 +0100

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

 .github/workflows/codeql.yml   | 6 +++---
 .github/workflows/scorecards-analysis.yaml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(struts) branch dependabot/github_actions/github/codeql-action-3.27.5 deleted (was 723045bab)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch 
dependabot/github_actions/github/codeql-action-3.27.5
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 723045bab Bump github/codeql-action from 3.27.4 to 3.27.5

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(struts) branch master updated (5f35af0e1 -> 9e0ff2a62)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


from 5f35af0e1 Merge pull request #792 from apache/release/struts-7-0-x
 add 4f6bda029 Bump maven-surefire-plugin.version from 3.5.1 to 3.5.2
 add 9e0ff2a62 Merge pull request #1121 from 
apache/dependabot/maven/maven-surefire-plugin.version-3.5.2

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch master updated (f5ab26d4e -> bc03f9a71)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


from f5ab26d4e Merge pull request #1135 from 
apache/dependabot/maven/jackson.version-2.18.2
 add c388cff64 Bump 
org.apache.maven.plugins:maven-project-info-reports-plugin
 new bc03f9a71 Merge pull request #1122 from 
apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.8.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) 01/01: Merge pull request #1122 from apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.8.0

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit bc03f9a71e598034874a96c24e690b3c48073b94
Merge: f5ab26d4e c388cff64
Author: Lukasz Lenart 
AuthorDate: Sat Nov 30 11:27:28 2024 +0100

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

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.8.0 deleted (was c388cff64)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch 
dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.8.0
in repository https://gitbox.apache.org/repos/asf/struts.git


 was c388cff64 Bump 
org.apache.maven.plugins:maven-project-info-reports-plugin

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(struts) branch fix/generics created (now 337da2d77)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch fix/generics
in repository https://gitbox.apache.org/repos/asf/struts.git


  at 337da2d77 NOJIRA Uses proper filed declarations and fixes generics

This branch includes the following new commits:

 new 337da2d77 NOJIRA Uses proper filed declarations and fixes generics

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(struts) 01/01: NOJIRA Uses proper filed declarations and fixes generics

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch fix/generics
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 337da2d7713db42a05632ac7812c4899035c0824
Author: Lukasz Lenart 
AuthorDate: Sat Nov 30 15:32:45 2024 +0100

NOJIRA Uses proper filed declarations and fixes generics
---
 .../template/TemplateRenderingContext.java | 32 +++---
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git 
a/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
 
b/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
index 50251a106..276d51dc7 100644
--- 
a/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
+++ 
b/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
@@ -18,33 +18,33 @@
  */
 package org.apache.struts2.components.template;
 
-import java.io.Writer;
-import java.util.Map;
-
 import org.apache.struts2.components.UIBean;
-
 import org.apache.struts2.util.ValueStack;
 
+import java.io.Writer;
+import java.util.Map;
+
 /**
  * Context used when rendering templates.
  */
 public class TemplateRenderingContext {
-Template template;
-ValueStack stack;
-Map parameters;
-UIBean tag;
-Writer writer;
+
+private final Template template;
+private final ValueStack stack;
+private final Map parameters;
+private final UIBean tag;
+private final Writer writer;
 
 /**
  * Constructor
  *
- * @param template  the template.
- * @param writerthe writer.
- * @param stack OGNL value stack.
- * @param paramsparameters to this template.
- * @param tag   the tag UI component.
+ * @param template the template.
+ * @param writer   the writer.
+ * @param stackOGNL value stack.
+ * @param params   parameters to this template.
+ * @param tag  the tag UI component.
  */
-public TemplateRenderingContext(Template template, Writer writer, 
ValueStack stack, Map params, UIBean tag) {
+public TemplateRenderingContext(Template template, Writer writer, 
ValueStack stack, Map params, UIBean tag) {
 this.template = template;
 this.writer = writer;
 this.stack = stack;
@@ -60,7 +60,7 @@ public class TemplateRenderingContext {
 return stack;
 }
 
-public Map getParameters() {
+public Map getParameters() {
 return parameters;
 }
 

(struts) 01/01: WW-5405 Prepares to rename master branch into main

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch feature/WW-5405-main
in repository https://gitbox.apache.org/repos/asf/struts.git

commit a8f979f7df56cfc748e3ccb9db591aca9dd6080b
Author: Lukasz Lenart 
AuthorDate: Sat Nov 30 09:37:27 2024 +0100

WW-5405 Prepares to rename master branch into main
---
 .asf.yaml  | 16 +++
 .github/workflows/codeql.yml   |  5 +++--
 .github/workflows/maven.yml|  5 +++--
 .github/workflows/scorecards-analysis.yaml |  3 ++-
 .github/workflows/sonar.yml|  9 +
 Jenkinsfile| 31 +-
 6 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 5e259c710..b2778fa2b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -21,6 +21,22 @@ github:
 # it does not work because our github teams are private/secret, see 
INFRA-25666
 require_code_owner_reviews: false
 required_approving_review_count: 0
+main:
+  # contexts are the names of checks that must pass.
+  contexts:
+- build
+  required_pull_request_reviews:
+# it does not work because our github teams are private/secret, see 
INFRA-25666
+require_code_owner_reviews: false
+required_approving_review_count: 0
+release/*:
+  # contexts are the names of checks that must pass.
+  contexts:
+- build
+  required_pull_request_reviews:
+# it does not work because our github teams are private/secret, see 
INFRA-25666
+require_code_owner_reviews: false
+required_approving_review_count: 0
   autolink_jira:
 - WW
   dependabot_alerts:  true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 23c804ec7..5dd7ebc8f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,8 +18,9 @@ name: "CodeQL"
 on:
   push:
 branches:
-  - master
-  - release/struts-7-0-x
+  - 'master'
+  - 'main'
+  - 'release/*'
   pull_request:
 
 permissions:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1e03eb8c7..5f4493f99 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,8 +19,9 @@ on:
   pull_request:
   push:
 branches:
-  - master
-  - release/struts-7-0-x
+  - 'master'
+  - 'main'
+  - 'release/*'
 
 permissions: read-all
 
diff --git a/.github/workflows/scorecards-analysis.yaml 
b/.github/workflows/scorecards-analysis.yaml
index 2480a7f39..0c4ba6ca6 100644
--- a/.github/workflows/scorecards-analysis.yaml
+++ b/.github/workflows/scorecards-analysis.yaml
@@ -21,7 +21,8 @@ on:
 - cron: "30 1 * * 6"# Weekly on Saturdays
   push:
 branches:
-  - master
+  - "master"
+  - "main"
 
 permissions: read-all
 
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index d04c72d10..58746571d 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -19,8 +19,8 @@ on:
   pull_request:
   push:
 branches:
-  - master
-  - release/struts-7-0-x
+  - 'master'
+  - 'main'
 
 permissions: read-all
 
@@ -45,5 +45,6 @@ jobs:
   - env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-if: ${{ github.ref == 'master' || github.base_ref == 'master' }}
-run: ./mvnw -B verify 
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar 
-Dsonar.branch.name=master -Pcoverage -DskipAssembly
+  MAIN_BRANCH: ${{ github.ref || github.base_ref || github.ref || 
github.base_ref }}
+if: ${{ github.ref == 'master' || github.base_ref == 'master' || 
github.ref == 'main' || github.base_ref == 'main' }}
+run: ./mvnw -B verify 
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.branch.name=${{ 
envs.MAIN_BRANCH }} -Pcoverage -DskipAssembly
diff --git a/Jenkinsfile b/Jenkinsfile
index 45cd77441..9337bc261 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
   stages {
 stage('Test') {
   steps {
-sh './mvnw -B -DskipAssembly verify --no-transfer-progress'
+sh './mvnw -B -DskipAssembly verify'
   }
   post {
 always {
@@ -67,9 +67,9 @@ pipeline {
 MAVEN_OPTS = "-Xmx1024m"
   }
   stages {
-stage('Test & Coverage') {
+stage('Test') {
   steps {
-sh './mvnw -B verify -Pcoverage -DskipAssembly 
--no-transfer-progress'
+sh './mvnw -B verify -Pcoverage -DskipAssembly'
   }
   post {
 always {
@@ -78,52 +78,39 @@ pipeline {
 }
   }
 }
-stage('Code Quality') {
-  when {
-anyOf {
-  branch 'master'; branch 'release/struts-7-0-x'
-}
-  }
-   

(struts) branch feature/WW-5405-main updated (ac270a8ab -> a8f979f7d)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch feature/WW-5405-main
in repository https://gitbox.apache.org/repos/asf/struts.git


omit ac270a8ab WW-5405 Prepares to rename master branch into main
 new a8f979f7d WW-5405 Prepares to rename master branch into main

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ac270a8ab)
\
 N -- N -- N   refs/heads/feature/WW-5405-main (a8f979f7d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/sonar.yml |  3 ++-
 Jenkinsfile | 24 ++--
 2 files changed, 8 insertions(+), 19 deletions(-)

(struts) branch feature/WW-5455-jasperreports7 updated (7201bd98b -> 95915dc81)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch feature/WW-5455-jasperreports7
in repository https://gitbox.apache.org/repos/asf/struts.git


 discard 7201bd98b WW-5455 Defines a new plugin to support Jasper Reports 7
 add 24e60416f WW-5486 Fixes exposing params added by 
ServletDispatcherResult
 add cf260074d WW-5486 Simplifies test to avoid using mocks
 add a49b5a361 WW-5486 Removes try-catches
 add 08f664c0e Merge pull request #1123 from 
apache/fix/WW-5486-request-params
 add 24c0e5f64 WW-5463 Exposes final location as request attribute 
FORWARD_SERVLET_PATH
 add 9b2d6a23e Merge pull request #1127 from 
apache/feature/WW-5463-servlet-path
 add cb08d18b5 Bump github/codeql-action from 3.27.0 to 3.27.1
 add 6b2e5ecd9 Merge pull request #1125 from 
apache/dependabot/github_actions/github/codeql-action-3.27.1
 add 8a2f494c1 WW-5484 Marks the DWR plugin as deprecated
 add 1903e0ef3 Merge pull request #1126 from apache/feature/WW-5484-dwr
 add 1f5305c24 [maven-release-plugin] prepare release STRUTS_6_7_0
 add 085f50d45 [maven-release-plugin] prepare for next development iteration
 add 8b9d61cdd Add .gitattributes in case people don't have core.autocrlf 
set
 add c8ab6ff64 Upgrade maven to 3.9.9 and wrapper to 3.3.2
 add 3b7a4d828 Merge pull request #1129 from 
sepe81/feature/Upgrade-maven-to-3.9.9-and-wrapper-to-3.3.2
 add b6d9dc9ec Bump github/codeql-action from 3.27.1 to 3.27.4
 add 780280aae Merge pull request #1128 from 
apache/dependabot/github_actions/github/codeql-action-3.27.4
 add 2e431df6b Always run Sonar scan against the master branch
 add 55885bc86 Runs Sonar step in case of running on master or PR
 add b1d7c09d0 Uses Java 21 when running Sonar check
 add c009a4ad1 Avoids running Sonar scan in forks
 add b3807b191 Merge pull request #921 from apache/fix/sonar
 add 58d4d700e Skip Sonar scan on PRs created by Dependabot
 add d6b015f62 Merge pull request #1130 from apache/fix/sonar-dependabot
 add 6e9fa714c Uses AND instead of OR to check Sonar prerequisites
 add b3e07474e Merge pull request #1131 from apache/fix/sonar-scan-and
 add 61000681b Merge remote-tracking branch 'origin/master' into 
merge/master-to-7xx-2024-11-29
 add c16ab0d86 Merge pull request #1134 from 
apache/merge/master-to-7xx-2024-11-29
 add 5f35af0e1 Merge pull request #792 from apache/release/struts-7-0-x
 add 95915dc81 WW-5455 Defines a new plugin to support Jasper Reports 7

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7201bd98b)
\
 N -- N -- N   refs/heads/feature/WW-5455-jasperreports7 (95915dc81)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .gitattributes |   5 +
 .github/workflows/codeql.yml   |   6 +-
 .github/workflows/scorecards-analysis.yaml |   2 +-
 .github/workflows/sonar.yml|   7 +-
 .mvn/wrapper/maven-wrapper.properties  |   5 +-
 .../java/org/apache/struts2/ActionContext.java |   2 +
 .../org/apache/struts2/dispatcher/Dispatcher.java  |   1 -
 .../struts2/result/ServletDispatcherResult.java|   7 +
 .../result/ServletDispatcherResultTest.java| 149 +++
 mvnw   | 435 +
 mvnw.cmd   | 304 ++
 11 files changed, 399 insertions(+), 524 deletions(-)
 create mode 100644 .gitattributes

Build failed in Jenkins: Struts » Struts-master-JDK8-dependency-check #212

[Apache Jenkins Server]

See 


Changes:

[Lukasz Lenart] WW-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WW-5141

[Lukasz Lenart] IPAGE-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WW-5141 remove code for "pell multipart plugin"

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] WW-5141 TODO:  TEMPORARY comment-out incomaptible 
commons-upload old version code

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] IPAGE-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WW-5141 fix security test

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WW-5141 temp IGNORE test require commons-upload upgrade

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WW-5141 conversion to fileupload2

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WW-5141 fix formatting problems

[Lukasz Lenart] WW-5335 Prepares for Java 17 & Struts 7.x

[Lukasz Lenart] WW-5335 Reverts adding release/struts-7-0-x branch to 
scorecards analysis

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WW-5335 Prepares for Java 17 & Struts 7.x

[Lukasz Lenart] WW-5335 Reverts adding release/struts-7-0-x branch to 
scorecards analysis

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] WN-5141

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] Revert "WN-5141"

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WN-5141

[Lukasz Lenart] [WW-5141] Removes deprecated plugins (#798)

[Lukasz Lenart] WW-5335 Prepares for Java 17 & Struts 7.x

[Lukasz Lenart] WW-5335 Reverts adding release/struts-7-0-x branch to 
scorecards analysis

[Lukasz Lenart] [WW-5141] Removes deprecated plugins (#798)

[Lukasz Lenart] Delete unused files missed in previous PR

[Lukasz Lenart] Delete remaining deprecated plugins

[Lukasz Lenart] WN-5141 fix whitespace issues

[Lukasz Lenart] Upgrades Htmlunit to version 3.6.0

[Lukasz Lenart] WN-5141

[Lukasz Lenart] WW-5371 Implements action based file upload

[Lukasz Lenart] WW-5371 Document how to use the new file upload logic

[Lukasz Lenart] WW-5370 Simplifies error handling logic

[Lukasz Lenart] WW-5371 Migrates modern upload change to JakartaEE

[Lukasz Lenart] WW-5371 Migrates modern upload change to JakartaEE

[Lukasz Lenart] WW-5364 fixes automatically populated OGNL allowlist

[Lukasz Lenart] WW-5339 Add option to block custom OGNL maps

[Lukasz Lenart] Adds missing import

[Lukasz Lenart] Replaces empty file upload test with simple one

[Lukasz Lenart] Upgrades Maven wrapper

[Lukasz Lenart] Fixes pipeline to properly handle transformed artifacts

[Lukasz Lenart] Moves JakartaEE related modules into dedicate subdirectory

[Lukasz Lenart] Fixes typo in pom

[Lukasz Lenart] Upgrades Mockito to ver 5.8.0

[git] Dependency manage byte-buddy

[git] Alphabetise dependency version props

[git] Upgrade Maven Surefire version

[Lukasz Lenart] Fixes wrong version in BOM

[Lukasz Lenart] Configure assembly plugin to use proper folders

[Lukasz Lenart] Cleans up assembly definitions

[Lukasz Lenart] Configures source-release assembly

[Lukasz Lenart] [maven-release-plugin] prepare release STRUTS_7_0_0_M1

[Lukasz Lenart] [maven-release-plugin] prepare for next development iteration

[Sebastian.Peters] Upgrade maven to 3.9.6 and wrapper to 3.2.0

[Lukasz Lenart] WW-5388 Uses the latest JakartaEE FileUpload Servlet 6 package

[Lukasz Lenart] WW-5388 Updates tests to match new logic

[Lukasz Lenart] WW-5388 Simplifies code

[Lukasz Lenart] WW-5388 Avoids unconditional invocations of method