(struts-site) 01/01: Merge pull request #237 from apache/fix/announce-2024
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-site.git commit f8f712d0df39818382cc6dcc58ce91def2d9 Merge: 47cbae9fc 770927ab3 Author: Lukasz Lenart AuthorDate: Mon Apr 22 20:01:35 2024 +0200 Merge pull request #237 from apache/fix/announce-2024 Fixes link to the announcement page source/_includes/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-site) branch master updated (47cbae9fc -> f8f712d0d)
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-site.git from 47cbae9fc Merge pull request #236 from apache/fix/sitemesh add 770927ab3 Fixes link to the announcement page new f8f712d0d Merge pull request #237 from apache/fix/announce-2024 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: source/_includes/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-site) branch fix/announce-2024 deleted (was 770927ab3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/announce-2024 in repository https://gitbox.apache.org/repos/asf/struts-site.git was 770927ab3 Fixes link to the announcement page 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-site) branch fix/announce-2024 created (now 770927ab3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/announce-2024 in repository https://gitbox.apache.org/repos/asf/struts-site.git at 770927ab3 Fixes link to the announcement page This branch includes the following new commits: new 770927ab3 Fixes link to the announcement page 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-site) 01/01: Fixes link to the announcement page
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/announce-2024 in repository https://gitbox.apache.org/repos/asf/struts-site.git commit 770927ab366914c43aa8cd46869cc2b277f742e9 Author: Lukasz Lenart AuthorDate: Mon Apr 22 19:55:55 2024 +0200 Fixes link to the announcement page --- source/_includes/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_includes/header.html b/source/_includes/header.html index 3cd9c776e..a379646e4 100644 --- a/source/_includes/header.html +++ b/source/_includes/header.html @@ -26,7 +26,7 @@ Welcome Download Releases -Announcements +Announcements http://www.apache.org/licenses/;>License https://www.apache.org/foundation/thanks.html;>Thanks! https://www.apache.org/foundation/sponsorship.html;>Sponsorship
(struts) 01/01: WW-5419 Fixes support for loading Tiles definitions
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5419-tiles
in repository https://gitbox.apache.org/repos/asf/struts.git
commit a88cb741d0296302d033b7e13e4a7806b345dea3
Author: Lukasz Lenart
AuthorDate: Sun Apr 21 10:21:55 2024 +0200
WW-5419 Fixes support for loading Tiles definitions
---
plugins/tiles/pom.xml | 10 +++
.../struts2/tiles/StrutsTilesContainerFactory.java | 16 ++---
.../StrutsWildcardServletApplicationContext.java | 9 ++-
.../tiles/StrutsTilesContainerFactoryTest.java | 9 ++-
...trutsWildcardServletApplicationContextTest.java | 79 ++
plugins/tiles/src/test/resources/WEB-INF/tiles.xml | 39 +++
.../org/apache/tiles/core/config/tiles_defs1.xml | 75
7 files changed, 216 insertions(+), 21 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 618bc6a8c..53d79b89d 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -102,6 +102,16 @@
log4j-jcl
test
+
+org.assertj
+assertj-core
+test
+
+
+org.springframework
+spring-test
+test
+
UTF-8
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index ed03f8268..4cda08522 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -68,10 +68,7 @@ import javax.el.MapELResolver;
import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -105,19 +102,16 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
/**
* Default pattern to be used to collect Tiles definitions if user didn't
configure any
- *
- * @deprecated since Struts 6.4.0, use {@link #TILES_DEFAULT_PATTERNS}
instead
*/
-@Deprecated
-public static final String TILES_DEFAULT_PATTERN =
"/WEB-INF/**/tiles*.xml,classpath*:META-INF/**/tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS =
TextParseUtil.commaDelimitedStringToSet("*tiles*.xml");
/**
* Default pattern to be used to collect Tiles definitions if user didn't
configure any
+ *
+ * @deprecated since Struts 6.4.0, use {@link #TILES_DEFAULT_PATTERNS}
instead
*/
-public static final Set TILES_DEFAULT_PATTERNS =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-"/WEB-INF/**/tiles*.xml",
-"classpath*:META-INF/**/tiles*.xml"
-)));
+@Deprecated
+public static final String TILES_DEFAULT_PATTERN = String.join(",",
TILES_DEFAULT_PATTERNS);
/**
* Supported expression languages
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
index 7af6069bb..2a30eb626 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
@@ -43,7 +43,7 @@ public class StrutsWildcardServletApplicationContext extends
ServletApplicationC
private static final Logger LOG =
LogManager.getLogger(StrutsWildcardServletApplicationContext.class);
-private ResourceFinder finder;
+private final ResourceFinder finder;
public StrutsWildcardServletApplicationContext(ServletContext context) {
super(context);
@@ -64,16 +64,15 @@ public class StrutsWildcardServletApplicationContext
extends ServletApplicationC
}
try {
-Enumeration resources =
getClass().getClassLoader().getResources("/");
+Enumeration resources =
getClass().getClassLoader().getResources("");
while (resources.hasMoreElements()) {
-URL resource = resources.nextElement();
-urls.add(resource);
+urls.add(resources.nextElement());
}
} catch (IOException e) {
throw new ConfigurationException(e);
}
-finder = new ResourceFinder(urls.toArray(new URL[urls.size()]));
+finder = new ResourceFinder(urls.toArray(new URL[0]));
}
public Collection getResources(String path) {
diff --git
a/plugins/tiles/src/test/java/org
(struts) branch fix/WW-5419-tiles updated (b174f3ecf -> a88cb741d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5419-tiles in repository https://gitbox.apache.org/repos/asf/struts.git omit b174f3ecf WW-5419 Fixes support for loading Tiles definitions new a88cb741d WW-5419 Fixes support for loading Tiles definitions 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 (b174f3ecf) \ N -- N -- N refs/heads/fix/WW-5419-tiles (a88cb741d) 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: .../apache/struts2/tiles/StrutsTilesContainerFactory.java| 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-)
(struts) branch dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.16.2 deleted (was b2b35f066)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.16.2 in repository https://gitbox.apache.org/repos/asf/struts.git was b2b35f066 Bump org.codehaus.mojo:versions-maven-plugin from 2.16.1 to 2.16.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 (eca5b2108 -> 3cde66859)
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 eca5b2108 Merge pull request #923 from apache/dependabot/github_actions/actions/upload-artifact-4.3.2 add b2b35f066 Bump org.codehaus.mojo:versions-maven-plugin from 2.16.1 to 2.16.2 add 3cde66859 Merge pull request #922 from apache/dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.16.2 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) 01/01: Merge pull request #923 from apache/dependabot/github_actions/actions/upload-artifact-4.3.2
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 eca5b210888f42ea73d437c104f2f2a0604c42cb Merge: efdaf7e50 856d98010 Author: Lukasz Lenart AuthorDate: Mon Apr 22 06:36:59 2024 +0200 Merge pull request #923 from apache/dependabot/github_actions/actions/upload-artifact-4.3.2 Bump actions/upload-artifact from 4.3.1 to 4.3.2 .github/workflows/scorecards-analysis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch master updated (efdaf7e50 -> eca5b2108)
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 efdaf7e50 Merge pull request #909 from apache/dependabot/maven/org.assertj-assertj-core-3.25.3 add 856d98010 Bump actions/upload-artifact from 4.3.1 to 4.3.2 new eca5b2108 Merge pull request #923 from apache/dependabot/github_actions/actions/upload-artifact-4.3.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: .github/workflows/scorecards-analysis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch dependabot/github_actions/actions/upload-artifact-4.3.2 deleted (was 856d98010)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/github_actions/actions/upload-artifact-4.3.2 in repository https://gitbox.apache.org/repos/asf/struts.git was 856d98010 Bump actions/upload-artifact from 4.3.1 to 4.3.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: Always run Sonar scan against the master branch
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sonar
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 47215ba42877da0966c5fb1bc180aa5c91a4c749
Author: Lukasz Lenart
AuthorDate: Sun Apr 21 13:44:32 2024 +0200
Always run Sonar scan against the master branch
---
.github/workflows/sonar.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 4a3667e4c..acbde6ab2 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -44,4 +44,4 @@ jobs:
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-run: mvn -B -V -Pcoverage -DskipAssembly verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar --no-transfer-progress
+run: ./mvnw verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Dsonar.branch.name=master -Pcoverage -DskipAssembly --no-transfer-progress
(struts) branch fix/sonar updated (5883c2ea5 -> 47215ba42)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sonar in repository https://gitbox.apache.org/repos/asf/struts.git discard 5883c2ea5 Always run Sonar scan against the master branch new 47215ba42 Always run Sonar scan against the master branch 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 (5883c2ea5) \ N -- N -- N refs/heads/fix/sonar (47215ba42) 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch fix/WW-5419-tiles updated (e8caaac10 -> b174f3ecf)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5419-tiles in repository https://gitbox.apache.org/repos/asf/struts.git discard e8caaac10 WW-5419 Fixes support for loading Tiles definitions new b174f3ecf WW-5419 Fixes support for loading Tiles definitions 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 (e8caaac10) \ N -- N -- N refs/heads/fix/WW-5419-tiles (b174f3ecf) 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: .../struts2/tiles/StrutsTilesContainerFactory.java | 16 ++-- 1 file changed, 2 insertions(+), 14 deletions(-)
(struts) 01/01: WW-5419 Fixes support for loading Tiles definitions
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5419-tiles
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b174f3ecf0a0d7b4d535d71d9df699191fd17675
Author: Lukasz Lenart
AuthorDate: Sun Apr 21 10:21:55 2024 +0200
WW-5419 Fixes support for loading Tiles definitions
---
plugins/tiles/pom.xml | 10 +++
.../struts2/tiles/StrutsTilesContainerFactory.java | 18 +
.../StrutsWildcardServletApplicationContext.java | 9 ++-
.../tiles/StrutsTilesContainerFactoryTest.java | 9 ++-
...trutsWildcardServletApplicationContextTest.java | 79 ++
plugins/tiles/src/test/resources/WEB-INF/tiles.xml | 39 +++
.../org/apache/tiles/core/config/tiles_defs1.xml | 75
7 files changed, 213 insertions(+), 26 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 618bc6a8c..53d79b89d 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -102,6 +102,16 @@
log4j-jcl
test
+
+org.assertj
+assertj-core
+test
+
+
+org.springframework
+spring-test
+test
+
UTF-8
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index ed03f8268..21bbbf97e 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -68,10 +68,7 @@ import javax.el.MapELResolver;
import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -105,19 +102,8 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
/**
* Default pattern to be used to collect Tiles definitions if user didn't
configure any
- *
- * @deprecated since Struts 6.4.0, use {@link #TILES_DEFAULT_PATTERNS}
instead
*/
-@Deprecated
-public static final String TILES_DEFAULT_PATTERN =
"/WEB-INF/**/tiles*.xml,classpath*:META-INF/**/tiles*.xml";
-
-/**
- * Default pattern to be used to collect Tiles definitions if user didn't
configure any
- */
-public static final Set TILES_DEFAULT_PATTERNS =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-"/WEB-INF/**/tiles*.xml",
-"classpath*:META-INF/**/tiles*.xml"
-)));
+public static final String TILES_DEFAULT_PATTERN = "*tiles*.xml";
/**
* Supported expression languages
@@ -227,7 +213,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TILES_DEFAULT_PATTERNS;
+return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
index 7af6069bb..2a30eb626 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
@@ -43,7 +43,7 @@ public class StrutsWildcardServletApplicationContext extends
ServletApplicationC
private static final Logger LOG =
LogManager.getLogger(StrutsWildcardServletApplicationContext.class);
-private ResourceFinder finder;
+private final ResourceFinder finder;
public StrutsWildcardServletApplicationContext(ServletContext context) {
super(context);
@@ -64,16 +64,15 @@ public class StrutsWildcardServletApplicationContext
extends ServletApplicationC
}
try {
-Enumeration resources =
getClass().getClassLoader().getResources("/");
+Enumeration resources =
getClass().getClassLoader().getResources("");
while (resources.hasMoreElements()) {
-URL resource = resources.nextElement();
-urls.add(resource);
+urls.add(resources.nextElement());
}
} catch (IOException e) {
throw new Configurat
(struts) 01/01: Always run Sonar scan against the master branch
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sonar
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 5883c2ea5e8d0cffb36b878c8e48432bbbdc4acb
Author: Lukasz Lenart
AuthorDate: Sun Apr 21 13:44:32 2024 +0200
Always run Sonar scan against the master branch
---
.github/workflows/sonar.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 4a3667e4c..f8434e021 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -44,4 +44,4 @@ jobs:
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-run: mvn -B -V -Pcoverage -DskipAssembly verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar --no-transfer-progress
+run: ./mvnw verify sonar:sonar -Dsonar.branch.name=master -Pcoverage
-DskipAssembly --no-transfer-progress
(struts) branch fix/sonar created (now 5883c2ea5)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sonar in repository https://gitbox.apache.org/repos/asf/struts.git at 5883c2ea5 Always run Sonar scan against the master branch This branch includes the following new commits: new 5883c2ea5 Always run Sonar scan against the master branch 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) branch fix/WW-5419-tiles created (now e8caaac10)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5419-tiles in repository https://gitbox.apache.org/repos/asf/struts.git at e8caaac10 WW-5419 Fixes support for loading Tiles definitions This branch includes the following new commits: new e8caaac10 WW-5419 Fixes support for loading Tiles definitions 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-5419 Fixes support for loading Tiles definitions
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5419-tiles
in repository https://gitbox.apache.org/repos/asf/struts.git
commit e8caaac10e8686b5cd1b38d08e18d143fb247ef7
Author: Lukasz Lenart
AuthorDate: Sun Apr 21 10:21:55 2024 +0200
WW-5419 Fixes support for loading Tiles definitions
---
plugins/tiles/pom.xml | 10 +++
.../struts2/tiles/StrutsTilesContainerFactory.java | 16 ++---
.../StrutsWildcardServletApplicationContext.java | 9 ++-
.../tiles/StrutsTilesContainerFactoryTest.java | 9 ++-
...trutsWildcardServletApplicationContextTest.java | 79 ++
plugins/tiles/src/test/resources/WEB-INF/tiles.xml | 39 +++
.../org/apache/tiles/core/config/tiles_defs1.xml | 75
7 files changed, 218 insertions(+), 19 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 618bc6a8c..53d79b89d 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -102,6 +102,16 @@
log4j-jcl
test
+
+org.assertj
+assertj-core
+test
+
+
+org.springframework
+spring-test
+test
+
UTF-8
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index ed03f8268..14d807b6b 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -68,7 +68,6 @@ import javax.el.MapELResolver;
import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -105,19 +104,18 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
/**
* Default pattern to be used to collect Tiles definitions if user didn't
configure any
- *
- * @deprecated since Struts 6.4.0, use {@link #TILES_DEFAULT_PATTERNS}
instead
*/
-@Deprecated
-public static final String TILES_DEFAULT_PATTERN =
"/WEB-INF/**/tiles*.xml,classpath*:META-INF/**/tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS =
Collections.unmodifiableSet(new HashSet<>(Collections.singletonList(
+"*tiles*.xml"
+)));
/**
* Default pattern to be used to collect Tiles definitions if user didn't
configure any
+ *
+ * @deprecated since Struts 6.4.0, use {@link #TILES_DEFAULT_PATTERNS}
instead
*/
-public static final Set TILES_DEFAULT_PATTERNS =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-"/WEB-INF/**/tiles*.xml",
-"classpath*:META-INF/**/tiles*.xml"
-)));
+@Deprecated
+public static final String TILES_DEFAULT_PATTERN = String.join(",",
TILES_DEFAULT_PATTERNS);
/**
* Supported expression languages
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
index 7af6069bb..2a30eb626 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
@@ -43,7 +43,7 @@ public class StrutsWildcardServletApplicationContext extends
ServletApplicationC
private static final Logger LOG =
LogManager.getLogger(StrutsWildcardServletApplicationContext.class);
-private ResourceFinder finder;
+private final ResourceFinder finder;
public StrutsWildcardServletApplicationContext(ServletContext context) {
super(context);
@@ -64,16 +64,15 @@ public class StrutsWildcardServletApplicationContext
extends ServletApplicationC
}
try {
-Enumeration resources =
getClass().getClassLoader().getResources("/");
+Enumeration resources =
getClass().getClassLoader().getResources("");
while (resources.hasMoreElements()) {
-URL resource = resources.nextElement();
-urls.add(resource);
+urls.add(resources.nextElement());
}
} catch (IOException e) {
throw new ConfigurationException(e);
}
-finder = new ResourceFinder(urls.toArray(new URL[urls.size()]));
+finder = new ResourceFinder(urls.toArray(new URL[0]));
}
public Collection getResources(String path) {
diff --git
a/plugins/tiles/src/test/java/org/apache/stru
(struts) branch dependabot/maven/org.assertj-assertj-core-3.25.3 deleted (was 268ed789e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.assertj-assertj-core-3.25.3 in repository https://gitbox.apache.org/repos/asf/struts.git was 268ed789e Bump org.assertj:assertj-core from 3.25.2 to 3.25.3 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-site) 01/01: Merge pull request #236 from apache/fix/sitemesh
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-site.git commit 47cbae9fc203df2a4d00d77e7c528ac8ed53fbe7 Merge: c77dc4556 976bde06d Author: Lukasz Lenart AuthorDate: Sat Apr 20 15:57:46 2024 +0200 Merge pull request #236 from apache/fix/sitemesh Fixes reference to the new filters and update plugins' layout source/_layouts/plugin.html| 59 source/core-developers/web-xml.md | 11 ++-- source/plugins/async/index.md | 4 +- source/plugins/bean-validation/index.md| 4 +- source/plugins/cdi/index.md| 4 +- source/plugins/codebehind/index.md | 4 +- source/plugins/config-browser/index.md | 4 +- source/plugins/convention/converting.md| 5 +- source/plugins/convention/index.md | 4 +- source/plugins/dwr/index.md| 4 +- source/plugins/embedded-jsp/index.md | 4 +- source/plugins/index.md| 62 +++--- source/plugins/jasperreports/index.md | 4 +- source/plugins/java-8-support/index.md | 4 +- source/plugins/javatemplates/index.md | 4 +- source/plugins/jfreechart/index.md | 4 +- source/plugins/jsf/index.md| 4 +- source/plugins/json/index.md | 4 +- source/plugins/json/json-ajax-validation.md| 4 +- source/plugins/junit/index.md | 4 +- source/plugins/osgi/index.md | 4 +- source/plugins/oval/index.md | 4 +- source/plugins/plexus/index.md | 4 +- source/plugins/portlet-tiles/index.md | 4 +- source/plugins/portlet/index.md| 4 +- .../plugins/portlet/struts-2-portlet-tutorial.md | 5 +- source/plugins/rest/index.md | 4 +- source/plugins/sitegraph/index.md | 4 +- source/plugins/sitemesh/index.md | 52 +- source/plugins/spring/index.md | 6 +-- .../spring-session-components-workarounds.md | 6 --- source/plugins/struts-1/index.md | 4 +- source/plugins/testng/index.md | 4 +- source/plugins/tiles-3/index.md| 4 +- source/plugins/tiles/index.md | 4 +- source/plugins/velocity/index.md | 2 +- 36 files changed, 125 insertions(+), 191 deletions(-)
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 976bde06dde1dbae77e0af09726778e1866b4cad
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html| 59
source/core-developers/web-xml.md | 11 ++--
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md| 4 +-
source/plugins/cdi/index.md| 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md| 5 +-
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md| 4 +-
source/plugins/embedded-jsp/index.md | 4 +-
source/plugins/index.md| 62 +++---
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md| 4 +-
source/plugins/json/index.md | 4 +-
source/plugins/json/json-ajax-validation.md| 4 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md | 4 +-
source/plugins/oval/index.md | 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md| 4 +-
.../plugins/portlet/struts-2-portlet-tutorial.md | 5 +-
source/plugins/rest/index.md | 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md | 52 +-
source/plugins/spring/index.md | 6 +--
.../spring-session-components-workarounds.md | 6 ---
source/plugins/struts-1/index.md | 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md| 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md | 2 +-
36 files changed, 125 insertions(+), 191 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.Str
(struts-site) branch fix/sitemesh updated (156ce676b -> c6949698d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 156ce676b Fixes reference to the new filters and update plugins' layout new c6949698d Fixes reference to the new filters and update plugins' layout 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 (156ce676b) \ N -- N -- N refs/heads/fix/sitemesh (c6949698d) 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: source/plugins/async/index.md | 2 +- source/plugins/bean-validation/index.md | 2 +- source/plugins/cdi/index.md | 2 +- source/plugins/codebehind/index.md | 2 +- source/plugins/config-browser/index.md | 2 +- source/plugins/convention/converting.md | 2 -- source/plugins/convention/index.md | 2 +- source/plugins/dwr/index.md | 2 +- source/plugins/embedded-jsp/index.md| 2 +- source/plugins/jasperreports/index.md | 2 +- source/plugins/java-8-support/index.md | 2 +- source/plugins/javatemplates/index.md | 2 +- source/plugins/jfreechart/index.md | 2 +- source/plugins/jsf/index.md | 2 +- source/plugins/json/index.md| 2 +- source/plugins/junit/index.md | 2 +- source/plugins/osgi/index.md| 2 +- source/plugins/oval/index.md| 2 +- source/plugins/plexus/index.md | 2 +- source/plugins/portlet-tiles/index.md | 2 +- source/plugins/portlet/index.md | 2 +- source/plugins/rest/index.md| 2 +- source/plugins/sitegraph/index.md | 2 +- source/plugins/sitemesh/index.md| 2 +- source/plugins/spring/index.md | 2 +- source/plugins/struts-1/index.md| 2 +- source/plugins/testng/index.md | 2 +- source/plugins/tiles-3/index.md | 2 +- source/plugins/tiles/index.md | 2 +- source/plugins/velocity/index.md| 2 +- 30 files changed, 29 insertions(+), 31 deletions(-)
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit c6949698dec90237b2aae629c448876eed6fc374
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 11 +++---
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md | 4 +-
source/plugins/cdi/index.md | 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md | 5 ++-
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md | 4 +-
source/plugins/embedded-jsp/index.md| 4 +-
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md | 4 +-
source/plugins/json/index.md| 4 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md| 4 +-
source/plugins/oval/index.md| 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md | 4 +-
source/plugins/rest/index.md| 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md| 52 -
source/plugins/spring/index.md | 4 +-
source/plugins/struts-1/index.md| 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md | 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md| 2 +-
33 files changed, 89 insertions(+), 150 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Pl
(struts) 01/01: Merge pull request #909 from apache/dependabot/maven/org.assertj-assertj-core-3.25.3
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 efdaf7e50f6660ca011b5fe219adf1b91f59edab Merge: 3c21e8229 268ed789e Author: Lukasz Lenart AuthorDate: Sat Apr 20 15:59:26 2024 +0200 Merge pull request #909 from apache/dependabot/maven/org.assertj-assertj-core-3.25.3 Bump org.assertj:assertj-core from 3.25.2 to 3.25.3 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch master updated (3c21e8229 -> efdaf7e50)
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 3c21e8229 Merge pull request #916 from apache/WW-5418-struts-sec add 268ed789e Bump org.assertj:assertj-core from 3.25.2 to 3.25.3 new efdaf7e50 Merge pull request #909 from apache/dependabot/maven/org.assertj-assertj-core-3.25.3 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-site) branch fix/sitemesh updated (0c076d8d4 -> 156ce676b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 0c076d8d4 Fixes reference to the new filters and update plugins' layout new 156ce676b Fixes reference to the new filters and update plugins' layout 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 (0c076d8d4) \ N -- N -- N refs/heads/fix/sitemesh (156ce676b) 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: source/plugins/convention/converting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 0c076d8d4eb1e991186e873b7c15a09410a5728a
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 11 +++---
source/plugins/async/index.md | 2 +-
source/plugins/bean-validation/index.md | 2 +-
source/plugins/cdi/index.md | 2 +-
source/plugins/codebehind/index.md | 2 +-
source/plugins/config-browser/index.md | 2 +-
source/plugins/convention/converting.md | 3 ++
source/plugins/convention/index.md | 2 +-
source/plugins/dwr/index.md | 2 +-
source/plugins/embedded-jsp/index.md| 2 +-
source/plugins/jasperreports/index.md | 2 +-
source/plugins/java-8-support/index.md | 2 +-
source/plugins/javatemplates/index.md | 2 +-
source/plugins/jfreechart/index.md | 2 +-
source/plugins/jsf/index.md | 2 +-
source/plugins/json/index.md| 2 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 2 +-
source/plugins/osgi/index.md| 2 +-
source/plugins/oval/index.md| 2 +-
source/plugins/plexus/index.md | 2 +-
source/plugins/portlet-tiles/index.md | 2 +-
source/plugins/portlet/index.md | 2 +-
source/plugins/rest/index.md| 2 +-
source/plugins/sitegraph/index.md | 2 +-
source/plugins/sitemesh/index.md| 52 -
source/plugins/spring/index.md | 2 +-
source/plugins/struts-1/index.md| 2 +-
source/plugins/testng/index.md | 2 +-
source/plugins/tiles-3/index.md | 2 +-
source/plugins/tiles/index.md | 2 +-
32 files changed, 61 insertions(+), 120 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Plugin](../plugins/sitemesh/) for an example on
(struts-site) branch fix/sitemesh deleted (was 976bde06d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git was 976bde06d Fixes reference to the new filters and update plugins' layout 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-site) branch master updated (c77dc4556 -> 47cbae9fc)
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-site.git from c77dc4556 Merge pull request #235 from apache/feature/struts-6-4-0 add 976bde06d Fixes reference to the new filters and update plugins' layout new 47cbae9fc Merge pull request #236 from apache/fix/sitemesh 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: source/_layouts/plugin.html| 59 source/core-developers/web-xml.md | 11 ++-- source/plugins/async/index.md | 4 +- source/plugins/bean-validation/index.md| 4 +- source/plugins/cdi/index.md| 4 +- source/plugins/codebehind/index.md | 4 +- source/plugins/config-browser/index.md | 4 +- source/plugins/convention/converting.md| 5 +- source/plugins/convention/index.md | 4 +- source/plugins/dwr/index.md| 4 +- source/plugins/embedded-jsp/index.md | 4 +- source/plugins/index.md| 62 +++--- source/plugins/jasperreports/index.md | 4 +- source/plugins/java-8-support/index.md | 4 +- source/plugins/javatemplates/index.md | 4 +- source/plugins/jfreechart/index.md | 4 +- source/plugins/jsf/index.md| 4 +- source/plugins/json/index.md | 4 +- source/plugins/json/json-ajax-validation.md| 4 +- source/plugins/junit/index.md | 4 +- source/plugins/osgi/index.md | 4 +- source/plugins/oval/index.md | 4 +- source/plugins/plexus/index.md | 4 +- source/plugins/portlet-tiles/index.md | 4 +- source/plugins/portlet/index.md| 4 +- .../plugins/portlet/struts-2-portlet-tutorial.md | 5 +- source/plugins/rest/index.md | 4 +- source/plugins/sitegraph/index.md | 4 +- source/plugins/sitemesh/index.md | 52 +- source/plugins/spring/index.md | 6 +-- .../spring-session-components-workarounds.md | 6 --- source/plugins/struts-1/index.md | 4 +- source/plugins/testng/index.md | 4 +- source/plugins/tiles-3/index.md| 4 +- source/plugins/tiles/index.md | 4 +- source/plugins/velocity/index.md | 2 +- 36 files changed, 125 insertions(+), 191 deletions(-) delete mode 100644 source/_layouts/plugin.html delete mode 100644 source/plugins/spring/spring-session-components-workarounds.md
(struts-site) branch fix/sitemesh updated (851e2bb6b -> 976bde06d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 851e2bb6b Fixes reference to the new filters and update plugins' layout new 976bde06d Fixes reference to the new filters and update plugins' layout 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 (851e2bb6b) \ N -- N -- N refs/heads/fix/sitemesh (976bde06d) 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: source/plugins/json/json-ajax-validation.md| 2 +- source/plugins/portlet/struts-2-portlet-tutorial.md| 5 - source/plugins/spring/index.md | 2 -- source/plugins/spring/spring-session-components-workarounds.md | 6 -- 4 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 source/plugins/spring/spring-session-components-workarounds.md
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 851e2bb6bd3d66379cbaac1fb1f47955fc74baa2
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 ---
source/core-developers/web-xml.md | 11 ++---
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md | 4 +-
source/plugins/cdi/index.md | 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md | 5 ++-
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md | 4 +-
source/plugins/embedded-jsp/index.md| 4 +-
source/plugins/index.md | 62 ++---
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md | 4 +-
source/plugins/json/index.md| 4 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md| 4 +-
source/plugins/oval/index.md| 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md | 4 +-
source/plugins/rest/index.md| 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md| 52 +++-
source/plugins/spring/index.md | 4 +-
source/plugins/struts-1/index.md| 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md | 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md| 2 +-
34 files changed, 120 insertions(+), 181 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on
(struts-site) branch fix/sitemesh updated (c6949698d -> 851e2bb6b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard c6949698d Fixes reference to the new filters and update plugins' layout new 851e2bb6b Fixes reference to the new filters and update plugins' layout 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 (c6949698d) \ N -- N -- N refs/heads/fix/sitemesh (851e2bb6b) 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: source/plugins/index.md | 62 - 1 file changed, 31 insertions(+), 31 deletions(-)
(struts-site) branch fix/sitemesh updated (a8327a0be -> d0acb231c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard a8327a0be Fixes reference to the new filters and update plugins' layout new d0acb231c Fixes reference to the new filters and update plugins' layout 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 (a8327a0be) \ N -- N -- N refs/heads/fix/sitemesh (d0acb231c) 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: source/core-developers/web-xml.md | 9 + 1 file changed, 5 insertions(+), 4 deletions(-)
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 156ce676bc3ee90a1f8005ea8e0dddc5d2036b34
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 11 +++---
source/plugins/async/index.md | 2 +-
source/plugins/bean-validation/index.md | 2 +-
source/plugins/cdi/index.md | 2 +-
source/plugins/codebehind/index.md | 2 +-
source/plugins/config-browser/index.md | 2 +-
source/plugins/convention/converting.md | 3 ++
source/plugins/convention/index.md | 2 +-
source/plugins/dwr/index.md | 2 +-
source/plugins/embedded-jsp/index.md| 2 +-
source/plugins/jasperreports/index.md | 2 +-
source/plugins/java-8-support/index.md | 2 +-
source/plugins/javatemplates/index.md | 2 +-
source/plugins/jfreechart/index.md | 2 +-
source/plugins/jsf/index.md | 2 +-
source/plugins/json/index.md| 2 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 2 +-
source/plugins/osgi/index.md| 2 +-
source/plugins/oval/index.md| 2 +-
source/plugins/plexus/index.md | 2 +-
source/plugins/portlet-tiles/index.md | 2 +-
source/plugins/portlet/index.md | 2 +-
source/plugins/rest/index.md| 2 +-
source/plugins/sitegraph/index.md | 2 +-
source/plugins/sitemesh/index.md| 52 -
source/plugins/spring/index.md | 2 +-
source/plugins/struts-1/index.md| 2 +-
source/plugins/testng/index.md | 2 +-
source/plugins/tiles-3/index.md | 2 +-
source/plugins/tiles/index.md | 2 +-
32 files changed, 61 insertions(+), 120 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Plugin](../plugins/sitemesh/) for an example on
(struts-site) branch fix/sitemesh updated (d0acb231c -> 0c076d8d4)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard d0acb231c Fixes reference to the new filters and update plugins' layout new 0c076d8d4 Fixes reference to the new filters and update plugins' layout 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 (d0acb231c) \ N -- N -- N refs/heads/fix/sitemesh (0c076d8d4) 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: source/plugins/async/index.md | 2 +- source/plugins/bean-validation/index.md | 2 +- source/plugins/cdi/index.md | 2 +- source/plugins/codebehind/index.md | 2 +- source/plugins/config-browser/index.md | 2 +- source/plugins/convention/index.md | 2 +- source/plugins/dwr/index.md | 2 +- source/plugins/embedded-jsp/index.md| 2 +- source/plugins/jasperreports/index.md | 2 +- source/plugins/java-8-support/index.md | 2 +- source/plugins/javatemplates/index.md | 2 +- source/plugins/jfreechart/index.md | 2 +- source/plugins/jsf/index.md | 2 +- source/plugins/json/index.md| 2 +- source/plugins/junit/index.md | 2 +- source/plugins/osgi/index.md| 2 +- source/plugins/oval/index.md| 2 +- source/plugins/plexus/index.md | 2 +- source/plugins/portlet-tiles/index.md | 2 +- source/plugins/portlet/index.md | 2 +- source/plugins/rest/index.md| 2 +- source/plugins/sitegraph/index.md | 2 +- source/plugins/sitemesh/index.md| 4 +--- source/plugins/spring/index.md | 2 +- source/plugins/struts-1/index.md| 2 +- source/plugins/testng/index.md | 2 +- source/plugins/tiles-3/index.md | 2 +- source/plugins/tiles/index.md | 2 +- source/plugins/velocity/index.md| 2 +- 29 files changed, 29 insertions(+), 31 deletions(-)
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit d0acb231c52f6cd4900b1ccfb7e01d0937d469d4
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 11 +++---
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md | 4 +-
source/plugins/cdi/index.md | 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md | 3 ++
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md | 4 +-
source/plugins/embedded-jsp/index.md| 4 +-
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md | 4 +-
source/plugins/json/index.md| 4 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md| 4 +-
source/plugins/oval/index.md| 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md | 4 +-
source/plugins/rest/index.md| 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md| 50
source/plugins/spring/index.md | 4 +-
source/plugins/struts-1/index.md| 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md | 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md| 2 +-
33 files changed, 89 insertions(+), 146 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Pl
(struts-site) branch fix/sitemesh created (now a8327a0be)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git at a8327a0be Fixes reference to the new filters and update plugins' layout This branch includes the following new commits: new a8327a0be Fixes reference to the new filters and update plugins' layout 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-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit a8327a0be7954486bbb4d666d1b20806346937ac
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 2 +-
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md | 4 +-
source/plugins/cdi/index.md | 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md | 3 ++
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md | 4 +-
source/plugins/embedded-jsp/index.md| 4 +-
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md | 4 +-
source/plugins/json/index.md| 4 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md| 4 +-
source/plugins/oval/index.md| 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md | 4 +-
source/plugins/rest/index.md| 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md| 50
source/plugins/spring/index.md | 4 +-
source/plugins/struts-1/index.md| 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md | 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md| 2 +-
33 files changed, 84 insertions(+), 142 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..b56c4e1a4 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -43,7 +43,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Plugin](../plugins/sitemesh/) for an example on when to use
separate Filters for prepare and execution phase.
## Custom mapping
diff --git a/source/plugins/async/index.md b/source/plugins/async/index.md
index 7c19b29e4..46575b0fb 100644
--- a/source/plugins/async/index.md
+++ b/source/plugins/async/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Async Plugin
parent:
- url: /plugins
+ url: plugins
title: Plugins
---
diff --git a/source/plugins/bean-validation/index.md
b/source/plugins/bean-validation/index.md
index 51a6064e4..cd92687d9 100644
--- a/source/plugins/bean-validation/index.md
+++ b/source/plugins/bean-validation/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Bean Validation Plugin
parent:
-url: /plugins
+url: plugins
title: Plugins
---
diff --git a/source/plugins/cdi/index.md b/source/plugins/cdi/index.md
index e26cd3be1..d11f46d87 100644
--- a/source/plugins/cdi/index.md
+++ b/source/plugins/cdi/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: CDI P
(struts-site) branch feature/struts-6-4-0 deleted (was 6bdaa22ba)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-4-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git was 6bdaa22ba Adds an announcement about Struts 6.4.0 and 7.0.0-M6 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-site) 01/01: Merge pull request #235 from apache/feature/struts-6-4-0
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-site.git commit c77dc455621faed01d3375742bc0372a7f598ca1 Merge: 5ab183fd3 6bdaa22ba Author: Lukasz Lenart AuthorDate: Sat Apr 20 10:36:12 2024 +0200 Merge pull request #235 from apache/feature/struts-6-4-0 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 _config.yml | 16 ++-- source/announce-2024.md | 66 + source/download.html| 18 +- source/index.html | 10 source/releases.html| 45 + 5 files changed, 136 insertions(+), 19 deletions(-)
(struts-site) branch master updated (5ab183fd3 -> c77dc4556)
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-site.git from 5ab183fd3 Merge pull request #233 from sclaup/patch-1 add 6bdaa22ba Adds an announcement about Struts 6.4.0 and 7.0.0-M6 new c77dc4556 Merge pull request #235 from apache/feature/struts-6-4-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: _config.yml | 16 ++-- source/announce-2024.md | 66 + source/download.html| 18 +- source/index.html | 10 source/releases.html| 45 + 5 files changed, 136 insertions(+), 19 deletions(-) create mode 100644 source/announce-2024.md
(struts-site) 01/01: Adds an announcement about Struts 6.4.0 and 7.0.0-M6
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/struts-6-4-0
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 6bdaa22ba3902aaac6028cd87c5fca043e8d895d
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 10:17:55 2024 +0200
Adds an announcement about Struts 6.4.0 and 7.0.0-M6
---
_config.yml | 16 ++--
source/announce-2024.md | 66 +
source/download.html| 18 +-
source/index.html | 10
source/releases.html| 45 +
5 files changed, 136 insertions(+), 19 deletions(-)
diff --git a/_config.yml b/_config.yml
index 0f31b71a7..e84ca4205 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,17 +11,17 @@ kramdown:
toc_levels: 1..3
# Simplifies introducing changes related to the latest release
-current_version: 6.3.0.2
-current_version_short: 6302
+current_version: 6.4.0
+current_version_short: 640
current_25x_version: 2.5.33
-prev_version: 6.3.0.1
-prev_version_short: 6301
+prev_version: 6.3.0.2
+prev_version_short: 6302
prev_25_version: 2.5.33
-release_date: 7 December 2023
-prev_release_date: 13 September 2023
+release_date: 19 April 2024
+prev_release_date: 7 December 2023
prev_25_release_date: 7 December 2023
-release_date_short: 20231207-1
-prev_release_date_short: 20230913-1
+release_date_short: 20240419
+prev_release_date_short: 20231207-1
prev_25_release_date_short: 20231207-2
beta_release_date_short: 20160126
diff --git a/source/announce-2024.md b/source/announce-2024.md
new file mode 100644
index 0..a2ea0e2e6
--- /dev/null
+++ b/source/announce-2024.md
@@ -0,0 +1,66 @@
+---
+layout: default
+title: Announcements 2024
+---
+
+# Announcements 2024
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
+
+
+ Skip to: Announcements - 2023
+
+
+ 20 April 2024 - Apache Struts version 7.0.0-M6 {#a20240420}
+
+The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+7.0.0-M6)
to find more details about performed
+> bug fixes and improvements.
+
+**This is a test build not ready to be used in production environments!**
+
+The 7.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+ 19 April 2024 - Apache Struts version 6.4.0 General Availability
{#a20240419}
+
+The Apache Struts group is pleased to announce that Apache Struts version
6.4.0 is available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+This version contains a lot of proactive security improvements, which should
make your application hard to compromise.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+6.4.0) to
find more details about performed
+> bug fixes and improvements.
+
+**All developers are strongly advised to perform this upgrade.**
+
+The 6.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+Servlet API 3.1, JSP API 2.1, and Java 8.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
+
+ Skip to: Announcements - 2023
+
+
+
+ Next:
+ Kickstart FAQ
+
diff --git a/source/download.html b/source/download.html
index 7e7e0e5d8..794e893ab 100644
--- a/source/download.html
+++ b/source/download.html
@@ -75,9 +75,10 @@ title: Download a Release
Full Distribution:
-struts-{{ site.current_version }}-all.zip
(73MB)
+struts-{{ site.current_version }}-all.zip
(70MB)
[https://downloads.apache.org/struts/{{ site.current_version
}}/struts-{{ site.current_version }}-all.zip.asc">PGP]
[https://downloads.apache.org/struts/{{ site.current_version
}}/struts-{{ site.current_version }}-all.zip.sha256">SHA256]
(struts-site) branch feature/struts-6-4-0 updated (776c4ce73 -> 6bdaa22ba)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-4-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 776c4ce73 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 new 6bdaa22ba Adds an announcement about Struts 6.4.0 and 7.0.0-M6 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 (776c4ce73) \ N -- N -- N refs/heads/feature/struts-6-4-0 (6bdaa22ba) 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: source/download.html | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-)
(struts-site) branch feature/struts-6-4-0 updated (4e67afe02 -> 776c4ce73)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-4-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 4e67afe02 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 new 776c4ce73 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 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 (4e67afe02) \ N -- N -- N refs/heads/feature/struts-6-4-0 (776c4ce73) 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: source/releases.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-site) 01/01: Adds an announcement about Struts 6.4.0 and 7.0.0-M6
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/struts-6-4-0
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 776c4ce732e4e5d4e010953403cc374067409c7d
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 10:17:55 2024 +0200
Adds an announcement about Struts 6.4.0 and 7.0.0-M6
---
_config.yml | 16 ++--
source/announce-2024.md | 66 +
source/index.html | 10
source/releases.html| 45 +
4 files changed, 124 insertions(+), 13 deletions(-)
diff --git a/_config.yml b/_config.yml
index 0f31b71a7..e84ca4205 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,17 +11,17 @@ kramdown:
toc_levels: 1..3
# Simplifies introducing changes related to the latest release
-current_version: 6.3.0.2
-current_version_short: 6302
+current_version: 6.4.0
+current_version_short: 640
current_25x_version: 2.5.33
-prev_version: 6.3.0.1
-prev_version_short: 6301
+prev_version: 6.3.0.2
+prev_version_short: 6302
prev_25_version: 2.5.33
-release_date: 7 December 2023
-prev_release_date: 13 September 2023
+release_date: 19 April 2024
+prev_release_date: 7 December 2023
prev_25_release_date: 7 December 2023
-release_date_short: 20231207-1
-prev_release_date_short: 20230913-1
+release_date_short: 20240419
+prev_release_date_short: 20231207-1
prev_25_release_date_short: 20231207-2
beta_release_date_short: 20160126
diff --git a/source/announce-2024.md b/source/announce-2024.md
new file mode 100644
index 0..a2ea0e2e6
--- /dev/null
+++ b/source/announce-2024.md
@@ -0,0 +1,66 @@
+---
+layout: default
+title: Announcements 2024
+---
+
+# Announcements 2024
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
+
+
+ Skip to: Announcements - 2023
+
+
+ 20 April 2024 - Apache Struts version 7.0.0-M6 {#a20240420}
+
+The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+7.0.0-M6)
to find more details about performed
+> bug fixes and improvements.
+
+**This is a test build not ready to be used in production environments!**
+
+The 7.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+ 19 April 2024 - Apache Struts version 6.4.0 General Availability
{#a20240419}
+
+The Apache Struts group is pleased to announce that Apache Struts version
6.4.0 is available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+This version contains a lot of proactive security improvements, which should
make your application hard to compromise.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+6.4.0) to
find more details about performed
+> bug fixes and improvements.
+
+**All developers are strongly advised to perform this upgrade.**
+
+The 6.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+Servlet API 3.1, JSP API 2.1, and Java 8.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
+
+ Skip to: Announcements - 2023
+
+
+
+ Next:
+ Kickstart FAQ
+
diff --git a/source/index.html b/source/index.html
index f9d932c69..04271602f 100644
--- a/source/index.html
+++ b/source/index.html
@@ -27,7 +27,7 @@ title: Welcome to the Apache Struts project
Apache Struts {{ site.current_version }} GA has been releasedon
{{ site.release_date }}.
-Read more in Announcement or in
+Read more in Announcement or in
Version notes
@@ -49,12 +49,12 @@ title: Welcome to the Apache Struts project
-Apache Struts 6.3.0 GA
+Apache Struts 7.0.0-M6
- Apache Struts 6.3.0 GA has been releasedon 4 September 2023.
+
(struts-site) branch feature/struts-6-4-0 created (now 4e67afe02)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-4-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git at 4e67afe02 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 This branch includes the following new commits: new 4e67afe02 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 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-site) 01/01: Adds an announcement about Struts 6.4.0 and 7.0.0-M6
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/struts-6-4-0
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 4e67afe0247d03be6d0bd9134a0f8069c810f1f0
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 10:17:55 2024 +0200
Adds an announcement about Struts 6.4.0 and 7.0.0-M6
---
_config.yml | 16 ++--
source/announce-2024.md | 66 +
source/index.html | 10
source/releases.html| 45 +
4 files changed, 124 insertions(+), 13 deletions(-)
diff --git a/_config.yml b/_config.yml
index 0f31b71a7..e84ca4205 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,17 +11,17 @@ kramdown:
toc_levels: 1..3
# Simplifies introducing changes related to the latest release
-current_version: 6.3.0.2
-current_version_short: 6302
+current_version: 6.4.0
+current_version_short: 640
current_25x_version: 2.5.33
-prev_version: 6.3.0.1
-prev_version_short: 6301
+prev_version: 6.3.0.2
+prev_version_short: 6302
prev_25_version: 2.5.33
-release_date: 7 December 2023
-prev_release_date: 13 September 2023
+release_date: 19 April 2024
+prev_release_date: 7 December 2023
prev_25_release_date: 7 December 2023
-release_date_short: 20231207-1
-prev_release_date_short: 20230913-1
+release_date_short: 20240419
+prev_release_date_short: 20231207-1
prev_25_release_date_short: 20231207-2
beta_release_date_short: 20160126
diff --git a/source/announce-2024.md b/source/announce-2024.md
new file mode 100644
index 0..a2ea0e2e6
--- /dev/null
+++ b/source/announce-2024.md
@@ -0,0 +1,66 @@
+---
+layout: default
+title: Announcements 2024
+---
+
+# Announcements 2024
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
+
+
+ Skip to: Announcements - 2023
+
+
+ 20 April 2024 - Apache Struts version 7.0.0-M6 {#a20240420}
+
+The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+7.0.0-M6)
to find more details about performed
+> bug fixes and improvements.
+
+**This is a test build not ready to be used in production environments!**
+
+The 7.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+ 19 April 2024 - Apache Struts version 6.4.0 General Availability
{#a20240419}
+
+The Apache Struts group is pleased to announce that Apache Struts version
6.4.0 is available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+This version contains a lot of proactive security improvements, which should
make your application hard to compromise.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+6.4.0) to
find more details about performed
+> bug fixes and improvements.
+
+**All developers are strongly advised to perform this upgrade.**
+
+The 6.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+Servlet API 3.1, JSP API 2.1, and Java 8.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
+
+ Skip to: Announcements - 2023
+
+
+
+ Next:
+ Kickstart FAQ
+
diff --git a/source/index.html b/source/index.html
index f9d932c69..04271602f 100644
--- a/source/index.html
+++ b/source/index.html
@@ -27,7 +27,7 @@ title: Welcome to the Apache Struts project
Apache Struts {{ site.current_version }} GA has been releasedon
{{ site.release_date }}.
-Read more in Announcement or in
+Read more in Announcement or in
Version notes
@@ -49,12 +49,12 @@ title: Welcome to the Apache Struts project
-Apache Struts 6.3.0 GA
+Apache Struts 7.0.0-M6
- Apache Struts 6.3.0 GA has been releasedon 4 September 2023.
+
svn commit: r68670 - /release/struts/6.3.0.2/
Author: lukaszlenart Date: Sat Apr 20 07:49:15 2024 New Revision: 68670 Log: Removes outdated version Removed: release/struts/6.3.0.2/
svn commit: r68669 - /release/struts/6.3.0.1/
Author: lukaszlenart Date: Sat Apr 20 07:49:10 2024 New Revision: 68669 Log: Removes outdated version Removed: release/struts/6.3.0.1/
svn commit: r68663 - /release/struts/6.1.2.1/
Author: lukaszlenart Date: Sat Apr 20 07:48:07 2024 New Revision: 68663 Log: Removes outdated version Removed: release/struts/6.1.2.1/
svn commit: r68668 - /release/struts/6.3.0/
Author: lukaszlenart Date: Sat Apr 20 07:49:00 2024 New Revision: 68668 Log: Removes outdated version Removed: release/struts/6.3.0/
svn commit: r68667 - /release/struts/2.5.32/
Author: lukaszlenart Date: Sat Apr 20 07:48:46 2024 New Revision: 68667 Log: Removes outdated version Removed: release/struts/2.5.32/
svn commit: r68666 - /release/struts/2.5.31/
Author: lukaszlenart Date: Sat Apr 20 07:48:40 2024 New Revision: 68666 Log: Removes outdated version Removed: release/struts/2.5.31/
svn commit: r68665 - /release/struts/6.2.0/
Author: lukaszlenart Date: Sat Apr 20 07:48:26 2024 New Revision: 68665 Log: Removes outdated version Removed: release/struts/6.2.0/
svn commit: r68664 - /release/struts/6.1.2.2/
Author: lukaszlenart Date: Sat Apr 20 07:48:15 2024 New Revision: 68664 Log: Removes outdated version Removed: release/struts/6.1.2.2/
svn commit: r68662 - /dev/struts/6.4.0/ /release/struts/6.4.0/
Author: lukaszlenart Date: Sat Apr 20 07:47:11 2024 New Revision: 68662 Log: Vote gas passed, Apache Struts 6.4.0 is out Added: release/struts/6.4.0/ - copied from r68661, dev/struts/6.4.0/ Removed: dev/struts/6.4.0/
svn commit: r68660 - /dev/struts/7.0.0-M6/
Author: lukaszlenart Date: Sat Apr 20 07:38:26 2024 New Revision: 68660 Log: Updates test release 7.0.0-M6 Added: dev/struts/7.0.0-M6/ dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-docs.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-docs.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-docs.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-docs.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-lib.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-lib.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-lib.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-lib.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-min-lib.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-min-lib.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-min-lib.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-min-lib.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-src.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-src.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-src.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-src.zip.sha512 Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip == Binary file - no diff available. Propchange: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip -- svn:mime-type = application/octet-stream Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.asc == --- dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.asc (added) +++ dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.asc Sat Apr 20 07:38:26 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmYjcGsYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfURoP/iidtfxQqqm6tZtpIXAXxZTA +B2ZoKBvTyc9EISpXBnnRJz8H6Kl9geNjvLmLqKKBBsnsqMU812e8bdoak3E+szkV +wlI18xb8hZAIcqYv4c0xe/OZdGIC6yJTS35kRqWBDE1m4cfpvkAstGiNcoGTRGdu +SBuuym60rfCJVq8azWYVLHpesAgGUlPlj5u9aJSHLmBIPULlalJDsf3hv9itG2nF +nXWi+dS5liX7GX1sr8pr28EwYQwYUK/ulRwgi+mTB9AoSSvdDODtzHirK9mryBDb +hu8kH9o/RoGxSovtUzPKB/u4Twg8Ml2vJTk4Ccercj+gyTVKuWO7oBxvkFxYZgZA +BZmQx9JCf0kNxkp8ql8JsaZDt2n1b4AGySr5UmkmgRlrYDuemPO3P06Ph9mLaEFm +gFwzAM1gCnWzrsmJ9fZ/ddU3gB5A99aReqC3MbUMIzkEKC11pTdk8sYKSq0RLn95 +8GBTVaCaQ6OCr+hr7WkrvKQTxRuQ6us25KkvhiUtoOx12rA9RO4i8cFRzse/cwy+ +wDE9wGur5Qji5F8NqEWnngMw9CU8g6oI/0jKJfV1swcLj5Ou9mAxUgVLRM+S6q/X +CbM9a9wVFZW12sYey34fgBh62ho4LHSDjqXA5PLDbU/gcFDJhEMGp0QfYIYAbIfN +YYeX+3mGYvnFH9bk15EF +=xrY5 +-END PGP SIGNATURE- Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha256 == --- dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha256 (added) +++ dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha256 Sat Apr 20 07:38:26 2024 @@ -0,0 +1 @@ +15852a6a080ee05285d9c9019fc71839e47fdc6183d49c1db3ae4f05e3302750 struts-7.0.0-M6-all.zip Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha512 == --- dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha512 (added) +++ dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha512 Sat Apr 20 07:38:26 2024 @@ -0,0 +1 @@ +d6d8bf0919c30d557fed21d910ffde8fa9de04260ad34ea8181da5a32fab64fd420ce30b2de53525dfd198bcadf805a0b64735c6c88e6a8065193bc4d19e40a6 struts-7.0.0-M6-all.zip Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip == Binary file - no diff available. Propchange: dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip -- svn:mime-type = application/octet-stream Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.asc == --- dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.asc (added) +++ dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.asc Sat Apr 20 07:38:26 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmYjcGwYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sflw8P/2lRAUzFfFZmxRxYDGl4XPHF +dFStCfErNFL1hQmH+ZVxL7IGSmfUtVoue+9HEuahBbyhOC1rV/Ic/2wKpG30EDMn +12RIJ/EKg/DP6gEhx5Pmc6VjRvb/9ExpxdyPogEk2XjfQkjQ9cSXziwfC8b1lVMG +8XmxQCJjOjc4bAEQZUU2AoXAibCrlb5/poMiQWq9QfKVzGx1P9MKgZxvRUTTtO94 +QFIZQatfmmaWkbCEL7K19dEWZvt9+UKUBwBys7J+eHqAv+E/UImeBx7thVzgnV1u
svn commit: r68661 - /dev/struts/7.0.0-M3/
Author: lukaszlenart Date: Sat Apr 20 07:39:11 2024 New Revision: 68661 Log: Struts 7.0.0-M6 is out Removed: dev/struts/7.0.0-M3/
(struts) branch release/struts-7-0-x updated (549c3bc98 -> af53f0d93)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 549c3bc98 [maven-release-plugin] prepare for next development iteration new 0a3b59664 Fixes creating assembly during release process new af53f0d93 [maven-release-plugin] prepare release STRUTS_7_0_0_M6 The 2 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: apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 3 ++- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 10 -- 30 files changed, 38 insertions(+), 39 deletions(-)
(struts) 02/02: [maven-release-plugin] prepare release STRUTS_7_0_0_M6
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git commit af53f0d93b8d0c4efa44e24347ebbddc6b69e8d1 Author: Lukasz Lenart AuthorDate: Sat Apr 20 09:24:22 2024 +0200 [maven-release-plugin] prepare release STRUTS_7_0_0_M6 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 787c3ec93..38e1a214b 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 3b2a7ac6c..f476e735c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-rest-showcase war -7.0.0-M6-SNAPSHOT +7.0.0-M6 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 900a3ae8c..c558edf65 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 4fb804e25..f2c1225c6 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 25303221b..261ea073f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-bom -7.0.0-M6-SNAPSHOT +7.0.0-M6 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M6-SNAPSHOT +7.0.0-M6 true true @@ -165,7 +165,7 @@ -HEAD +STRUTS_7_0_0_M6 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index fdba1e65a..520bb2714 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index c80a01740..8b3ff585b 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 1613769ae..e509b8ce2 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-jakarta pom diff --git a/jakarta/sitemesh2-jakarta/pom.xml b/jakarta/sitemesh2-jakarta/pom.xml index 16854fd83..2ee3b49f4 100644
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 2352c6863 [maven-release-plugin] prepare for next development iteration 2352c6863 is described below commit 2352c686312c571e360573b1252d85bc2be9468b Author: Lukasz Lenart AuthorDate: Sat Apr 20 09:24:32 2024 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 38e1a214b..219bf4ceb 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index f476e735c..20759b000 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-rest-showcase war -7.0.0-M6 +7.0.0-M7-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index c558edf65..e2ed9f10a 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index f2c1225c6..90e4c8e96 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 261ea073f..a8bdb360c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-bom -7.0.0-M6 +7.0.0-M7-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M6 +7.0.0-M7-SNAPSHOT true true @@ -165,7 +165,7 @@ -STRUTS_7_0_0_M6 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index 520bb2714..bfc4d6e68 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index 8b3ff585b..fd7991463 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index e509b8ce2..da0c3f2ae 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent
(struts) annotated tag STRUTS_7_0_0_M6 created (now 12f21eedf)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M6 in repository https://gitbox.apache.org/repos/asf/struts.git at 12f21eedf (tag) tagging af53f0d93b8d0c4efa44e24347ebbddc6b69e8d1 (commit) replaces STRUTS_7_0_0_M5 by Lukasz Lenart on Sat Apr 20 09:24:27 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M6 --- No new revisions were added by this update.
(struts) 01/02: Fixes creating assembly during release process
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git commit 0a3b596648348894f52c3cc3e4b3a3fc1b63b47a Author: Lukasz Lenart AuthorDate: Sat Apr 20 09:17:11 2024 +0200 Fixes creating assembly during release process --- assembly/pom.xml | 1 + pom.xml | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 8aa56982b..4fb804e25 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -115,6 +115,7 @@ +false src/main/assembly/all.xml src/main/assembly/lib.xml diff --git a/pom.xml b/pom.xml index 4fddf7ceb..3a7a2e5be 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts-master -14 +15 4.0.0 @@ -345,10 +345,8 @@ org.apache.maven.plugins maven-assembly-plugin -3.6.0 true -true
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 549c3bc98 [maven-release-plugin] prepare for next development iteration 549c3bc98 is described below commit 549c3bc989c43f83caadeb94651b1f15a5b7176f Author: Lukasz Lenart AuthorDate: Fri Apr 19 21:00:01 2024 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 091238706..787c3ec93 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 762f0f543..3b2a7ac6c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-rest-showcase war -7.0.0-M5 +7.0.0-M6-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index bbe515f76..900a3ae8c 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index b10d31ab4..8aa56982b 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index de2bdf837..25303221b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-bom -7.0.0-M5 +7.0.0-M6-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M5 +7.0.0-M6-SNAPSHOT true true @@ -165,7 +165,7 @@ -STRUTS_7_0_0_M5 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index 4a6ce770f..fdba1e65a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index 759329348..c80a01740 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 165066f05..1613769ae 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare release STRUTS_7_0_0_M5
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 4acb0d16d [maven-release-plugin] prepare release STRUTS_7_0_0_M5 4acb0d16d is described below commit 4acb0d16da729e783bc4fdd763863f44116eb92c Author: Lukasz Lenart AuthorDate: Fri Apr 19 20:59:51 2024 +0200 [maven-release-plugin] prepare release STRUTS_7_0_0_M5 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index f02b21a10..091238706 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 218b676b3..762f0f543 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-rest-showcase war -7.0.0-M5-SNAPSHOT +7.0.0-M5 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 867dac867..bbe515f76 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 2654b1c4c..b10d31ab4 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index e4e96f59a..de2bdf837 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-bom -7.0.0-M5-SNAPSHOT +7.0.0-M5 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M5-SNAPSHOT +7.0.0-M5 true true @@ -165,7 +165,7 @@ -HEAD +STRUTS_7_0_0_M5 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index 5dc84bf39..4a6ce770f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index ea6da0bf7..759329348 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index d3acd71c7..165066f05 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5
(struts) annotated tag STRUTS_7_0_0_M5 created (now 27d8e9e15)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M5 in repository https://gitbox.apache.org/repos/asf/struts.git at 27d8e9e15 (tag) tagging 4acb0d16da729e783bc4fdd763863f44116eb92c (commit) replaces STRUTS_7_0_0_M4 by Lukasz Lenart on Fri Apr 19 20:59:56 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M5 --- No new revisions were added by this update.
(struts) branch release/struts-7-0-x updated (b3e5c2429 -> ce7671568)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git omit b3e5c2429 Fixes after merge assembly issue add ce7671568 Fixes after merge assembly issue 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 (b3e5c2429) \ N -- N -- N refs/heads/release/struts-7-0-x (ce7671568) 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: assembly/pom.xml | 4 +- .../admin/src/main/resources/osgi/admin/shell.ftl | 0 core/pom.xml | 45 -- pom.xml| 9 + 4 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 bundles/admin/src/main/resources/osgi/admin/shell.ftl
(struts) branch release/struts-7-0-x updated (8b9173469 -> b3e5c2429)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 8b9173469 [maven-release-plugin] prepare for next development iteration add b3e5c2429 Fixes after merge assembly issue No new revisions were added by this update. Summary of changes: assembly/pom.xml | 3 ++- pom.xml | 11 --- 2 files changed, 2 insertions(+), 12 deletions(-)
svn commit: r68642 - /dev/struts/7.0.0-M4/
Author: lukaszlenart Date: Fri Apr 19 07:02:00 2024 New Revision: 68642 Log: Drops broke release Removed: dev/struts/7.0.0-M4/
svn commit: r68641 - /dev/struts/7.0.0-M4/
Author: lukaszlenart Date: Fri Apr 19 07:00:43 2024 New Revision: 68641 Log: Updates test release 7.0.0-M4 Added: dev/struts/7.0.0-M4/
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 8b9173469 [maven-release-plugin] prepare for next development iteration 8b9173469 is described below commit 8b9173469ccf1baf988ba1b3dc654d0d13ff84bc Author: Lukasz Lenart AuthorDate: Fri Apr 19 08:38:28 2024 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index f0ff835a2..f02b21a10 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index d9c545444..218b676b3 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-rest-showcase war -7.0.0-M4 +7.0.0-M5-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 444a2ca62..867dac867 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 4a97085c7..6dc24d2c1 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 8bbec2e21..e4e96f59a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-bom -7.0.0-M4 +7.0.0-M5-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M4 +7.0.0-M5-SNAPSHOT true true @@ -165,7 +165,7 @@ -STRUTS_7_0_0_M4 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index 10e54aec8..c03a49dca 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index 126e80c21..ea6da0bf7 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index fd12937e9..d3acd71c7 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent
(struts) annotated tag STRUTS_7_0_0_M4 created (now ea2012ffe)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M4 in repository https://gitbox.apache.org/repos/asf/struts.git at ea2012ffe (tag) tagging aca2eb07ef9293575e1975d7810a85a825181a86 (commit) replaces STRUTS_7_0_0_M3 by Lukasz Lenart on Fri Apr 19 08:38:24 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M4 --- No new revisions were added by this update.
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare release STRUTS_7_0_0_M4
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new aca2eb07e [maven-release-plugin] prepare release STRUTS_7_0_0_M4 aca2eb07e is described below commit aca2eb07ef9293575e1975d7810a85a825181a86 Author: Lukasz Lenart AuthorDate: Fri Apr 19 08:38:19 2024 +0200 [maven-release-plugin] prepare release STRUTS_7_0_0_M4 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 2154785f6..f0ff835a2 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index b5c19ab00..d9c545444 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-rest-showcase war -7.0.0-M4-SNAPSHOT +7.0.0-M4 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 51a308c4a..444a2ca62 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 093e02641..4a97085c7 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 16b8caf36..8bbec2e21 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-bom -7.0.0-M4-SNAPSHOT +7.0.0-M4 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M4-SNAPSHOT +7.0.0-M4 true true @@ -165,7 +165,7 @@ -HEAD +STRUTS_7_0_0_M4 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index c73248252..10e54aec8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index d8eb4e004..126e80c21 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 50f6f40f1..fd12937e9 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4
(struts) branch release/struts-7-0-x updated (f59a06063 -> 964590c9a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git omit f59a06063 Merge pull request #904 from apache/merge/master-to-7xx-2024-04-07 add 964590c9a Merge pull request #904 from apache/merge/master-to-7xx-2024-04-07 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 (f59a06063) \ N -- N -- N refs/heads/release/struts-7-0-x (964590c9a) 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch release/struts-7-0-x updated (4939d3cef -> f59a06063)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 4939d3cef Merge pull request #893 from gregh3269/fix-STRUTS_7_0_0_M3-upload-file-name add ceb0a9a73 Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0 add c553c93fa Merge pull request #843 from apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 add 9d2a7649c Updates link to build status on Jenkins add 93fa72ee1 Merge pull request #878 from apache/fix/build-status add 43d180f36 Bump org.apache.maven.doxia:doxia-core from 1.9.1 to 1.12.0 add d9ed77d3f Merge pull request #879 from apache/dependabot/maven/org.apache.maven.doxia-doxia-core-1.12.0 add 94b2ee7ce Bump slf4j.version from 2.0.11 to 2.0.12 add 82491eff8 Merge pull request #880 from apache/dependabot/maven/slf4j.version-2.0.12 add 8283ded5e Bump org.apache.maven.doxia:doxia-module-markdown from 1.9.1 to 1.12.0 add 3aa63e8cb Merge pull request #883 from apache/dependabot/maven/org.apache.maven.doxia-doxia-module-markdown-1.12.0 add 1ddf446f7 Bump commons-validator:commons-validator from 1.6 to 1.8.0 add 0c4e21145 Merge pull request #882 from apache/dependabot/maven/commons-validator-commons-validator-1.8.0 add 43f119796 Bump org.apache.commons:commons-compress from 1.25.0 to 1.26.0 add 154132d46 Merge pull request #884 from apache/dependabot/maven/org.apache.commons-commons-compress-1.26.0 add ac6095d1a Bump maven-surefire-plugin.version from 3.0.0-M7 to 3.2.5 add 6648cbdb2 Merge pull request #886 from apache/dependabot/maven/maven-surefire-plugin.version-3.2.5 add f45998102 WW-5401 Improves logging around wrapping request and detecting multipart request add c32018127 WW-5401 Fixes typo add ac6c88ad4 WW-5401 Uses same message approach add e08f637be Merge pull request #892 from apache/feature/WW-5401-logging add 29422e47f WW-5364 Fix potential NPE in XmlDocConfigurationProvider add 86aee4b0e Merge pull request #894 from apache/WW-5364-npe add db0bd4385 Converts multiple file uploads example to use Action based upload add cdc931e26 Merge pull request #895 from apache/fix/file-uploads add cda2a2b23 WW-5251 Reinstate deleted interfaces with transparent compat add 19698e1fd WW-5251 Fix ParameterAware add dc774c484 WW-5251 Reinstate RequestAware add 7281d7e2e Merge pull request #898 from apache/WW-5251-retrofit-compat add 6950fcb75 Enables required review by codeowners add 66c1ac431 Merge pull request #899 from apache/feature/codeowners-review add 93c11aaf6 WW-5251 Fix deprecated interface method signature add c774e23ef Merge pull request #900 from apache/WW-5251-retrofit-compat add c7ae61482 WW-5402 Auto loads Tiles definitions from classpath add 689d17d27 Merge pull request #896 from apache/feature/WW-5402-autoload-classptah add 273c3a1a9 Uses proper context name in branch protection rule add 5cf746f53 Merge pull request #901 from apache/fix/branch-protction add 7a79576bb Bump log4j2.version from 2.21.1 to 2.23.1 add ee38cd5b1 Merge pull request #902 from apache/dependabot/maven/log4j2.version-2.23.1 add db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release add 0f6d5dbb2 Merge pull request #903 from apache/fix/WW-5390-assembly add e5e6145c3 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07 add f59a06063 Merge pull request #904 from apache/merge/master-to-7xx-2024-04-07 No new revisions were added by this update. Summary of changes: .asf.yaml | 8 +- README.md | 2 +- .../showcase/fileupload/FileUploadAction.java | 5 +- .../MultipleFileUploadUsingArrayAction.java| 82 ++--- .../MultipleFileUploadUsingListAction.java | 88 +++--- .../providers/XmlDocConfigurationProvider.java | 4 +- .../apache/struts2/action/UploadedFilesAware.java | 3 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 13 ++- .../multipart/AbstractMultiPartRequest.java| 11 +- .../multipart/JakartaMultiPartRequest.java | 7 +- .../multipart/JakartaStreamMultiPartRequest.java | 6 +- .../dispatcher/multipart/MultiPartRequest.java | 2 +- .../multipart/MultiPartRequestWrapper.java | 3 +- .../dispatcher/multipart/StrutsUploadedFile.java | 4 +- .../struts2/dispatcher/multipart/UploadedFile.java | 4 +- .../interceptor/AbstractFileUploadInterceptor.java | 3 +- .../interceptor/ActionFileUploadInterceptor.java | 7 +- .../struts2/interceptor/ApplicationAware.java} | 18 ++- .../struts2/interceptor/HttpParametersAware.java} | 18 ++- .../struts2/interceptor/ParameterAware.java
(struts) branch merge/master-to-7xx-2024-04-07 deleted (was e5e6145c3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge/master-to-7xx-2024-04-07 in repository https://gitbox.apache.org/repos/asf/struts.git was e5e6145c3 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r68351 - /dev/struts/6.4.0/*.zip.sha512
Author: lukaszlenart Date: Sun Apr 7 09:39:53 2024 New Revision: 68351 Log: Removes not a file Removed: dev/struts/6.4.0/*.zip.sha512
svn commit: r68350 - /dev/struts/6.4.0/*.zip.sha256
Author: lukaszlenart Date: Sun Apr 7 09:39:35 2024 New Revision: 68350 Log: Removes not a file Removed: dev/struts/6.4.0/*.zip.sha256
svn commit: r68349 - /dev/struts/6.4.0/
Author: lukaszlenart Date: Sun Apr 7 09:33:30 2024 New Revision: 68349 Log: Updates test release 6.4.0 Added: dev/struts/6.4.0/ dev/struts/6.4.0/*.zip.sha256 dev/struts/6.4.0/*.zip.sha512 dev/struts/6.4.0/struts-6.4.0-all.zip (with props) dev/struts/6.4.0/struts-6.4.0-all.zip.asc dev/struts/6.4.0/struts-6.4.0-all.zip.sha256 dev/struts/6.4.0/struts-6.4.0-all.zip.sha512 dev/struts/6.4.0/struts-6.4.0-apps.zip (with props) dev/struts/6.4.0/struts-6.4.0-apps.zip.asc dev/struts/6.4.0/struts-6.4.0-apps.zip.sha256 dev/struts/6.4.0/struts-6.4.0-apps.zip.sha512 dev/struts/6.4.0/struts-6.4.0-docs.zip (with props) dev/struts/6.4.0/struts-6.4.0-docs.zip.asc dev/struts/6.4.0/struts-6.4.0-docs.zip.sha256 dev/struts/6.4.0/struts-6.4.0-docs.zip.sha512 dev/struts/6.4.0/struts-6.4.0-lib.zip (with props) dev/struts/6.4.0/struts-6.4.0-lib.zip.asc dev/struts/6.4.0/struts-6.4.0-lib.zip.sha256 dev/struts/6.4.0/struts-6.4.0-lib.zip.sha512 dev/struts/6.4.0/struts-6.4.0-min-lib.zip (with props) dev/struts/6.4.0/struts-6.4.0-min-lib.zip.asc dev/struts/6.4.0/struts-6.4.0-min-lib.zip.sha256 dev/struts/6.4.0/struts-6.4.0-min-lib.zip.sha512 dev/struts/6.4.0/struts-6.4.0-src.zip (with props) dev/struts/6.4.0/struts-6.4.0-src.zip.asc dev/struts/6.4.0/struts-6.4.0-src.zip.sha256 dev/struts/6.4.0/struts-6.4.0-src.zip.sha512 Added: dev/struts/6.4.0/*.zip.sha256 == (empty) Added: dev/struts/6.4.0/*.zip.sha512 == (empty) Added: dev/struts/6.4.0/struts-6.4.0-all.zip == Binary file - no diff available. Propchange: dev/struts/6.4.0/struts-6.4.0-all.zip -- svn:mime-type = application/octet-stream Added: dev/struts/6.4.0/struts-6.4.0-all.zip.asc == --- dev/struts/6.4.0/struts-6.4.0-all.zip.asc (added) +++ dev/struts/6.4.0/struts-6.4.0-all.zip.asc Sun Apr 7 09:33:30 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmYSZ8oYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfHXkP/A8sl0PxH0ckc6U5y3KEw3z8 +Yv9FTHEbQwT7fd1+xknTFGKlnkehlw5Pa3hs8OteboC7UbalXqTGW3ttlM0ZPRpE +0w9wT+aCAvKm0b/Cbw6ys0JV5BIHxRjeFQpbx2SlVleOoCIE3rsMe2SDOQ1hS5sC +qoA12vMOPrq+fPsv9lkN/yiaXc7F321dkprYAnrlpRan2JHW6gsK/HfBi8WAxVJt +P7o1HegyxN4MsXVdDTcHhADInbXj8+VLhklPt1Z8AmxCAzXPsogMsDL7v8J2krnI +pS6OuacbKP/MOKSwp8W3e7iPdfPqS/+gAtal5tunlrHR8geB37f3u1fMrILnt2ar +Xi7s+xsbbdu17Q7nRQ/QHXUXaBoVfYGMo12acep/iENEX1RPrbWWH0BNC1RYWj/h +g/FZCgFsuX7V4vJ7bZqNonLZA4XLegnld0jVXjsScG7QQqQbxFjLb23W2kX2Renm +hrqCZ+Fwaoauhj8DYyXbPRuf/aB1SEhS1tuaiXCvwiyZ4aCO6GGQDk1KtWWLhfYT +AQwpKYMSQG0mZgizR6i/bSEAvtxqOmeanPjEqAyMu1JoPiMVlh5qWfrjy4fL6e+A +H0iHYfifsF/9GyAS9PaPjI7xjhq2biBVlzuFewcJGm9nQhmmY22Q9tjKdnyqw1E5 +WQt0R9KeaiPXr03cgWy3 +=5k5h +-END PGP SIGNATURE- Added: dev/struts/6.4.0/struts-6.4.0-all.zip.sha256 == --- dev/struts/6.4.0/struts-6.4.0-all.zip.sha256 (added) +++ dev/struts/6.4.0/struts-6.4.0-all.zip.sha256 Sun Apr 7 09:33:30 2024 @@ -0,0 +1 @@ +86929bd2b2637cc016495415be523303c1db0e273238a8b03a2e7f5a9eb0e5f8 struts-6.4.0-all.zip Added: dev/struts/6.4.0/struts-6.4.0-all.zip.sha512 == --- dev/struts/6.4.0/struts-6.4.0-all.zip.sha512 (added) +++ dev/struts/6.4.0/struts-6.4.0-all.zip.sha512 Sun Apr 7 09:33:30 2024 @@ -0,0 +1 @@ +3d597b97e7ac574cd0ff5bcc7f37cbf9e91c54d674dde25714fb9eb8ab9a1809192735ad3a129bf310be7d5323e09cef231812c02771ecabc05fc69f6285c722 struts-6.4.0-all.zip Added: dev/struts/6.4.0/struts-6.4.0-apps.zip == Binary file - no diff available. Propchange: dev/struts/6.4.0/struts-6.4.0-apps.zip -- svn:mime-type = application/octet-stream Added: dev/struts/6.4.0/struts-6.4.0-apps.zip.asc == --- dev/struts/6.4.0/struts-6.4.0-apps.zip.asc (added) +++ dev/struts/6.4.0/struts-6.4.0-apps.zip.asc Sun Apr 7 09:33:30 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmYSZ8sYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfVeQQAIujxNhd8kZaf5X+w5E/cmRN +Rxr+4xbKIpFRT6BPb80EgKXtsIlIDLmClQGrWyi1E9vcuTW7/bt5Wx0HJgzjMYGa +LcnOyfhISytFbwHvSdO/EKkgozpU8nyzBp7qLAfU6K9smcrN/KLCzrHSdSISGEBO +EDe2OtygXnIwT/L7y7stq+4VcJCd8NS6tav/O56nRasztFf0llA/a/c/UeFO4Pi5 +SPGqO78PnIM17XOgn6aKJpD+GtvHD5r0uG8BZiaIX
(struts) branch master updated: [maven-release-plugin] prepare for next development iteration
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 The following commit(s) were added to refs/heads/master by this push: new c6d13f101 [maven-release-plugin] prepare for next development iteration c6d13f101 is described below commit c6d13f1016cb283405546b577a7a39d1ac3918b8 Author: Lukasz Lenart AuthorDate: Sun Apr 7 11:22:16 2024 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-junit/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index def718cbe..16c95aa5f 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 0af45ba83..1961facbc 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.4.0 +6.5.0-SNAPSHOT struts2-rest-showcase war -6.4.0 +6.5.0-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index e07d22dcd..a1a9138cd 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.4.0 +6.5.0-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index c926fe998..c59792f80 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index b4fe9687a..a2bd291aa 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-bom -6.4.0 +6.5.0-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.4.0 +6.5.0-SNAPSHOT true true @@ -190,7 +190,7 @@ -STRUTS_6_4_0 +STRUTS_6_3_0_1 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 0bd89bb80..1485e7f68 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0 +6.5.0-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index f2b8399da..ad74c9648 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0 +6.5.0-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index bce21ff1d..ebd7adbf3 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b
(struts) 02/02: [maven-release-plugin] prepare release STRUTS_6_4_0
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 9c5c80d1731a13af0dc80fc3a04700f9a15dcf2a Author: Lukasz Lenart AuthorDate: Sun Apr 7 11:22:06 2024 +0200 [maven-release-plugin] prepare release STRUTS_6_4_0 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-junit/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index a1a187151..def718cbe 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 7c6f16051..0af45ba83 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.4.0-SNAPSHOT +6.4.0 struts2-rest-showcase war -6.4.0-SNAPSHOT +6.4.0 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 263c029f8..e07d22dcd 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.4.0-SNAPSHOT +6.4.0 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 2b5d960c1..c926fe998 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index c0b520f81..b4fe9687a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-bom -6.4.0-SNAPSHOT +6.4.0 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.4.0-SNAPSHOT +6.4.0 true true @@ -190,7 +190,7 @@ -STRUTS_6_3_0_1 +STRUTS_6_4_0 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 8c2c35a7d..0bd89bb80 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0-SNAPSHOT +6.4.0 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 884bdce3a..f2b8399da 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0-SNAPSHOT +6.4.0 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 408947c8f..bce21ff1d 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 26634e2d6..0af7d3ec7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT
(struts) annotated tag STRUTS_6_4_0 created (now 1b0e1dcb4)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_6_4_0 in repository https://gitbox.apache.org/repos/asf/struts.git at 1b0e1dcb4 (tag) tagging 9c5c80d1731a13af0dc80fc3a04700f9a15dcf2a (commit) replaces STRUTS_6_3_0_1 by Lukasz Lenart on Sun Apr 7 11:22:11 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_6_4_0 --- No new revisions were added by this update.
(struts) 01/02: Reverts release and fixes issue with assembly
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 a6d6d918fa6df82ff2682e904fc32abfad2e8c78 Author: Lukasz Lenart AuthorDate: Sun Apr 7 11:11:32 2024 +0200 Reverts release and fixes issue with assembly --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 4 +++- bom/pom.xml | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-junit/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 13 + 39 files changed, 44 insertions(+), 53 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 16c95aa5f..a1a187151 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 1961facbc..7c6f16051 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT struts2-rest-showcase war -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index a1a9138cd..263c029f8 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index cc4c61fef..2b5d960c1 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT struts2-assembly @@ -104,7 +104,9 @@ +org.apache.maven.plugins maven-assembly-plugin +3.6.0 make-assembly diff --git a/bom/pom.xml b/bom/pom.xml index a2bd291aa..c0b520f81 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT struts2-bom -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT true true diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 1485e7f68..8c2c35a7d 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index ad74c9648..884bdce3a 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index ebd7adbf3..408947c8f 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.5.0-SNAPSHOT +6.4.0-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 3fcfaaf7b..26634e2d6 100644
(struts) branch master updated (5e8b81b38 -> 9c5c80d17)
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 5e8b81b38 [maven-release-plugin] prepare for next development iteration new a6d6d918f Reverts release and fixes issue with assembly new 9c5c80d17 [maven-release-plugin] prepare release STRUTS_6_4_0 The 2 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: apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 4 +++- bom/pom.xml | 8 bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-junit/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 17 +++-- 39 files changed, 47 insertions(+), 56 deletions(-)
(struts) annotated tag STRUTS_6_4_0 deleted (was 55c21072d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_6_4_0 in repository https://gitbox.apache.org/repos/asf/struts.git *** WARNING: tag STRUTS_6_4_0 was deleted! *** tag was 55c21072d The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch master updated: [maven-release-plugin] prepare for next development iteration
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 The following commit(s) were added to refs/heads/master by this push: new 5e8b81b38 [maven-release-plugin] prepare for next development iteration 5e8b81b38 is described below commit 5e8b81b3822b1e14b829cf69e6d8aa87b80376d9 Author: Lukasz Lenart AuthorDate: Sun Apr 7 08:13:17 2024 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-junit/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index def718cbe..16c95aa5f 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 0af45ba83..1961facbc 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.4.0 +6.5.0-SNAPSHOT struts2-rest-showcase war -6.4.0 +6.5.0-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index e07d22dcd..a1a9138cd 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.4.0 +6.5.0-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 4e76f7f3e..cc4c61fef 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index b4fe9687a..a2bd291aa 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-bom -6.4.0 +6.5.0-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.4.0 +6.5.0-SNAPSHOT true true @@ -190,7 +190,7 @@ -STRUTS_6_4_0 +STRUTS_6_3_0_1 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 0bd89bb80..1485e7f68 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0 +6.5.0-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index f2b8399da..ad74c9648 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0 +6.5.0-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index bce21ff1d..ebd7adbf3 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b
(struts) annotated tag STRUTS_6_4_0 created (now 55c21072d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_6_4_0 in repository https://gitbox.apache.org/repos/asf/struts.git at 55c21072d (tag) tagging f8381fbdbf2893d232b12a24299c5698041f0efd (commit) replaces STRUTS_6_3_0_1 by Lukasz Lenart on Sun Apr 7 08:13:12 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_6_4_0 --- No new revisions were added by this update.
(struts) branch master updated: [maven-release-plugin] prepare release STRUTS_6_4_0
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 The following commit(s) were added to refs/heads/master by this push: new f8381fbdb [maven-release-plugin] prepare release STRUTS_6_4_0 f8381fbdb is described below commit f8381fbdbf2893d232b12a24299c5698041f0efd Author: Lukasz Lenart AuthorDate: Sun Apr 7 08:13:07 2024 +0200 [maven-release-plugin] prepare release STRUTS_6_4_0 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-junit/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index a1a187151..def718cbe 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 7c6f16051..0af45ba83 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.4.0-SNAPSHOT +6.4.0 struts2-rest-showcase war -6.4.0-SNAPSHOT +6.4.0 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 263c029f8..e07d22dcd 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.4.0-SNAPSHOT +6.4.0 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 531e3fb1a..4e76f7f3e 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index c0b520f81..b4fe9687a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-bom -6.4.0-SNAPSHOT +6.4.0 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.4.0-SNAPSHOT +6.4.0 true true @@ -190,7 +190,7 @@ -STRUTS_6_3_0_1 +STRUTS_6_4_0 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 8c2c35a7d..0bd89bb80 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0-SNAPSHOT +6.4.0 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 884bdce3a..f2b8399da 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0-SNAPSHOT +6.4.0 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 408947c8f..bce21ff1d 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index
(struts) 01/01: Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch merge/master-to-7xx-2024-04-07
in repository https://gitbox.apache.org/repos/asf/struts.git
commit e5e6145c361ec6e6c98d86f9aaeef7e4bdb14f30
Merge: 4939d3cef 0f6d5dbb2
Author: Lukasz Lenart
AuthorDate: Sun Apr 7 07:58:50 2024 +0200
Merge remote-tracking branch 'origin/master' into
merge/master-to-7xx-2024-04-07
# Conflicts:
# pom.xml
.asf.yaml | 8 +-
README.md | 2 +-
.../showcase/fileupload/FileUploadAction.java | 5 +-
.../MultipleFileUploadUsingArrayAction.java| 82 ++---
.../MultipleFileUploadUsingListAction.java | 88 +++---
.../providers/XmlDocConfigurationProvider.java | 4 +-
.../apache/struts2/action/UploadedFilesAware.java | 3 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 13 ++-
.../multipart/AbstractMultiPartRequest.java| 11 +-
.../multipart/JakartaMultiPartRequest.java | 7 +-
.../multipart/JakartaStreamMultiPartRequest.java | 6 +-
.../dispatcher/multipart/MultiPartRequest.java | 2 +-
.../multipart/MultiPartRequestWrapper.java | 3 +-
.../dispatcher/multipart/StrutsUploadedFile.java | 4 +-
.../struts2/dispatcher/multipart/UploadedFile.java | 4 +-
.../interceptor/AbstractFileUploadInterceptor.java | 3 +-
.../interceptor/ActionFileUploadInterceptor.java | 7 +-
.../struts2/interceptor/ApplicationAware.java} | 16 +--
.../struts2/interceptor/HttpParametersAware.java} | 16 +--
.../struts2/interceptor/ParameterAware.java} | 20 ++--
.../struts2/interceptor/PrincipalAware.java} | 14 +--
.../apache/struts2/interceptor/RequestAware.java} | 23 +++-
.../struts2/interceptor/ServletRequestAware.java} | 16 +--
.../struts2/interceptor/ServletResponseAware.java} | 16 +--
.../apache/struts2/interceptor/SessionAware.java} | 16 +--
.../apache/struts2/util/ServletContextAware.java} | 16 +--
.../multipart/AbstractMultiPartRequestTest.java| 8 +-
.../multipart/JakartaMultiPartRequestTest.java | 4 +-
.../ActionFileUploadInterceptorTest.java | 14 +--
.../interceptor/FileUploadInterceptorTest.java | 14 +--
plugins/jasperreports/pom.xml | 2 +-
.../portlet/interceptor/PortletContextAware.java | 16 +--
.../interceptor/PortletPreferencesAware.java | 16 +--
.../portlet/interceptor/PortletRequestAware.java | 16 +--
.../portlet/interceptor/PortletResponseAware.java | 16 +--
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 28 +++--
.../tiles/StrutsTilesContainerFactoryTest.java | 128 +
pom.xml| 47 +++-
39 files changed, 436 insertions(+), 281 deletions(-)
diff --cc
core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
index 1c9148047,23d879ba4..630d2ca43
---
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
@@@ -46,10 -34,8 +46,10 @@@ import java.util.Map
* Abstract class with some helper methods, it should be used
* when starting development of another implementation of {@link
MultiPartRequest}
*/
- public abstract class AbstractMultiPartRequest implements MultiPartRequest
{
+ public abstract class AbstractMultiPartRequest implements MultiPartRequest {
+protected static final String
STRUTS_MESSAGES_UPLOAD_ERROR_PARAMETER_TOO_LONG_KEY =
"struts.messages.upload.error.parameter.too.long";
+
private static final Logger LOG =
LogManager.getLogger(AbstractMultiPartRequest.class);
/**
@@@ -98,14 -76,9 +98,14 @@@
protected String defaultEncoding;
/**
- * Localization to be used regarding errors.
+ * Map between file fields and file data.
*/
- protected Map>> uploadedFiles = new
HashMap<>();
-protected Locale defaultLocale = Locale.ENGLISH;
++protected Map> uploadedFiles = new HashMap<>();
+
+/**
+ * Map between non-file fields and values.
+ */
+protected Map> parameters = new HashMap<>();
/**
* @param bufferSize Sets the buffer size to be used.
@@@ -296,109 -169,4 +296,108 @@@
return fileName;
}
+protected String sanitizeNewlines(String before) {
+return before.replaceAll("\\R", "_");
+}
+
+/* (non-Javadoc)
+ * @see
org.apache.struts2.dispatcher.multipart.MultiPartRequest#getErrors()
+ */
+public List getErrors() {
+return errors;
+}
+
+/* (non-Javadoc)
+ * @see
org.apache.struts2.dispatcher.multipart.Mul
(struts) branch merge/master-to-7xx-2024-04-07 created (now e5e6145c3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge/master-to-7xx-2024-04-07 in repository https://gitbox.apache.org/repos/asf/struts.git at e5e6145c3 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07 This branch includes the following new commits: new e5e6145c3 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07 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) branch fix/WW-5390-assembly deleted (was db725518e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5390-assembly in repository https://gitbox.apache.org/repos/asf/struts.git was db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release 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 #903 from apache/fix/WW-5390-assembly
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 0f6d5dbb2f5ef0399f73d17309f91cab9f625030 Merge: ee38cd5b1 db725518e Author: Lukasz Lenart AuthorDate: Sun Apr 7 07:08:19 2024 +0200 Merge pull request #903 from apache/fix/WW-5390-assembly WW-5390 Fixes creating assembly and attaching sources when preparing a new release pom.xml | 25 - 1 file changed, 12 insertions(+), 13 deletions(-)
(struts) branch master updated (ee38cd5b1 -> 0f6d5dbb2)
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 ee38cd5b1 Merge pull request #902 from apache/dependabot/maven/log4j2.version-2.23.1 add db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release new 0f6d5dbb2 Merge pull request #903 from apache/fix/WW-5390-assembly 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 | 25 - 1 file changed, 12 insertions(+), 13 deletions(-)
(struts) 01/01: WW-5390 Fixes creating assembly and attaching sources when preparing a new release
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/WW-5390-assembly in repository https://gitbox.apache.org/repos/asf/struts.git commit db725518ee82158acb422bee414d0b6fd2bac540 Author: Lukasz Lenart AuthorDate: Sat Apr 6 19:36:14 2024 +0200 WW-5390 Fixes creating assembly and attaching sources when preparing a new release --- pom.xml | 25 - 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 418017057..79824373b 100644 --- a/pom.xml +++ b/pom.xml @@ -296,14 +296,7 @@ org.apache.maven.plugins maven-source-plugin - - -attach-sources - -jar - - - +3.3.0 org.apache.rat @@ -358,6 +351,17 @@ true + +org.apache.maven.plugins +maven-assembly-plugin +3.6.0 + +true +true +assembly/out +assembly/work + + org.apache.maven.plugins maven-enforcer-plugin @@ -388,7 +392,6 @@ org.apache.maven.plugins maven-release-plugin - 3.0.1 @@ -412,10 +415,6 @@ - -org.apache.maven.plugins -maven-source-plugin - org.apache.maven.plugins maven-site-plugin
(struts) branch fix/WW-5390-assembly created (now db725518e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5390-assembly in repository https://gitbox.apache.org/repos/asf/struts.git at db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release This branch includes the following new commits: new db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release 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-master) branch master updated: [maven-release-plugin] prepare for next development iteration
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-master.git The following commit(s) were added to refs/heads/master by this push: new 088099c [maven-release-plugin] prepare for next development iteration 088099c is described below commit 088099cd5327176d19998102eb5bcb3e436505de Author: Lukasz Lenart AuthorDate: Sat Apr 6 19:10:52 2024 +0200 [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9f94f85..e964c3f 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.apache.struts struts-master -15 +16-SNAPSHOT pom Apache Struts @@ -15,7 +15,7 @@ scm:git:https://gitbox.apache.org/repos/asf/struts-master.git scm:git:https://gitbox.apache.org/repos/asf/struts-master.git https://github.com/apache/struts-master/ -STRUTS_MASTER_15 +HEAD
(struts-master) annotated tag STRUTS_MASTER_15 created (now 8757af7)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_MASTER_15 in repository https://gitbox.apache.org/repos/asf/struts-master.git at 8757af7 (tag) tagging 1c851543c49e77b461116f14347968460fb50014 (commit) replaces STRUTS_MASTER_14 by Lukasz Lenart on Sat Apr 6 19:10:47 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_MASTER_15 --- No new revisions were added by this update.
(struts-master) 01/02: Uses Apache Master 31 version
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-master.git commit 7b0bb25dc2fb3a2e2f688425f6a0d706abd05b78 Author: Lukasz Lenart AuthorDate: Sat Apr 6 19:09:48 2024 +0200 Uses Apache Master 31 version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 94d3d86..a2d14c4 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.apache apache -22 +31 org.apache.struts struts-master
