(struts) branch feature/WW-5402-autoload-classptah updated (0f4ef3c2f -> a8a9e6d73)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah in repository https://gitbox.apache.org/repos/asf/struts.git discard 0f4ef3c2f WW-5402 Auto loads Tiles definitions from classpath new a8a9e6d73 WW-5402 Auto loads Tiles definitions from classpath 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 (0f4ef3c2f) \ N -- N -- N refs/heads/feature/WW-5402-autoload-classptah (a8a9e6d73) 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: .../org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit a8a9e6d73078f90c4dab0f44ae2300dc136d61c4
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 25 ++--
.../tiles/StrutsTilesContainerFactoryTest.java | 127 +
3 files changed, 145 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
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 205476467..aba4e5985 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
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -69,6 +69,7 @@ import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -100,10 +101,20 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * Default pattern to be used to collect Tiles definitions if user didn't
configure any
+ * @deprecated 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 String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS = new
HashSet() {{
+add("/WEB-INF/**/tiles*.xml");
+add("classpath*:META-INF/**/tiles*.xml");
+}};
/**
* Supported expression languages
@@ -213,7 +224,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..58029f964
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distrib
(struts) branch feature/WW-5402-autoload-classptah updated (a8a9e6d73 -> fcde5a25a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah in repository https://gitbox.apache.org/repos/asf/struts.git discard a8a9e6d73 WW-5402 Auto loads Tiles definitions from classpath new fcde5a25a WW-5402 Auto loads Tiles definitions from classpath 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 (a8a9e6d73) \ N -- N -- N refs/heads/feature/WW-5402-autoload-classptah (fcde5a25a) 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: .../org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java | 7 +++ 1 file changed, 7 insertions(+)
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit fcde5a25a82caf937cc505d06fc33641bc68b177
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 25 ++--
.../tiles/StrutsTilesContainerFactoryTest.java | 134 +
3 files changed, 152 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
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 205476467..aba4e5985 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
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -69,6 +69,7 @@ import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -100,10 +101,20 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * Default pattern to be used to collect Tiles definitions if user didn't
configure any
+ * @deprecated 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 String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS = new
HashSet() {{
+add("/WEB-INF/**/tiles*.xml");
+add("classpath*:META-INF/**/tiles*.xml");
+}};
/**
* Supported expression languages
@@ -213,7 +224,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..890403e8a
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distrib
(struts) branch feature/WW-5402-autoload-classptah updated (fcde5a25a -> 67b26901d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah in repository https://gitbox.apache.org/repos/asf/struts.git discard fcde5a25a WW-5402 Auto loads Tiles definitions from classpath new 67b26901d WW-5402 Auto loads Tiles definitions from classpath 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 (fcde5a25a) \ N -- N -- N refs/heads/feature/WW-5402-autoload-classptah (67b26901d) 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: .../java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 67b26901dfc303c47a54f2296adbdcdb2146614f
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 25 ++--
.../tiles/StrutsTilesContainerFactoryTest.java | 135 +
3 files changed, 153 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
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 205476467..aba4e5985 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
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -69,6 +69,7 @@ import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -100,10 +101,20 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * Default pattern to be used to collect Tiles definitions if user didn't
configure any
+ * @deprecated 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 String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS = new
HashSet() {{
+add("/WEB-INF/**/tiles*.xml");
+add("classpath*:META-INF/**/tiles*.xml");
+}};
/**
* Supported expression languages
@@ -213,7 +224,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..5b033b493
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distrib
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 7c69765ddb26ca2585ee91ba08f05ca7bbdc70cc
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 25 ++--
.../tiles/StrutsTilesContainerFactoryTest.java | 134 +
3 files changed, 152 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
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 205476467..d1b1a4f52 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
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -69,6 +69,7 @@ import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -100,10 +101,20 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * 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 String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS = new
HashSet() {{
+add("/WEB-INF/**/tiles*.xml");
+add("classpath*:META-INF/**/tiles*.xml");
+}};
/**
* Supported expression languages
@@ -213,7 +224,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..bc4fd7331
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the
(struts) branch feature/WW-5402-autoload-classptah updated (67b26901d -> 7c69765dd)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah in repository https://gitbox.apache.org/repos/asf/struts.git discard 67b26901d WW-5402 Auto loads Tiles definitions from classpath new 7c69765dd WW-5402 Auto loads Tiles definitions from classpath 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 (67b26901d) \ N -- N -- N refs/heads/feature/WW-5402-autoload-classptah (7c69765dd) 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: .../java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java | 2 +- .../org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java| 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit bf2d375110aecea885b06d774dc801509709ec1c
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 25 ++--
.../tiles/StrutsTilesContainerFactoryTest.java | 126 +
3 files changed, 144 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
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 205476467..d1b1a4f52 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
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -69,6 +69,7 @@ import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -100,10 +101,20 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * 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 String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS = new
HashSet() {{
+add("/WEB-INF/**/tiles*.xml");
+add("classpath*:META-INF/**/tiles*.xml");
+}};
/**
* Supported expression languages
@@ -213,7 +224,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..0ae0eb7c5
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the
(struts) branch feature/WW-5402-autoload-classptah updated (7c69765dd -> bf2d37511)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah in repository https://gitbox.apache.org/repos/asf/struts.git discard 7c69765dd WW-5402 Auto loads Tiles definitions from classpath new bf2d37511 WW-5402 Auto loads Tiles definitions from classpath 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 (7c69765dd) \ N -- N -- N refs/heads/feature/WW-5402-autoload-classptah (bf2d37511) 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: .../tiles/StrutsTilesContainerFactoryTest.java | 62 ++ 1 file changed, 27 insertions(+), 35 deletions(-)
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 885c9a51e883e07b5e6f857d64f225695bb6a778
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 25 ++--
.../tiles/StrutsTilesContainerFactoryTest.java | 128 +
3 files changed, 146 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
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 205476467..d1b1a4f52 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
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -69,6 +69,7 @@ import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -100,10 +101,20 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * 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 String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS = new
HashSet() {{
+add("/WEB-INF/**/tiles*.xml");
+add("classpath*:META-INF/**/tiles*.xml");
+}};
/**
* Supported expression languages
@@ -213,7 +224,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..122bfe51d
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the
(struts) branch feature/WW-5402-autoload-classptah updated (bf2d37511 -> 885c9a51e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah in repository https://gitbox.apache.org/repos/asf/struts.git discard bf2d37511 WW-5402 Auto loads Tiles definitions from classpath new 885c9a51e WW-5402 Auto loads Tiles definitions from classpath 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 (bf2d37511) \ N -- N -- N refs/heads/feature/WW-5402-autoload-classptah (885c9a51e) 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/StrutsTilesContainerFactoryTest.java | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-)
(struts-site) 01/01: Merge pull request #232 from apache/fix/file-upload-navigation
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 675562186a3112e4bf7ae5393fb2d102807fc814
Merge: 440ac19bf bb53f2be5
Author: Lukasz Lenart
AuthorDate: Mon Mar 25 10:12:15 2024 +0100
Merge pull request #232 from apache/fix/file-upload-navigation
Splits file upload page
.gitignore | 3 +-
Gemfile.lock | 70 -
_config.yml| 4 +-
docker-arm64-serve.sh | 3 +
source/_layouts/default.html | 2 +-
.../action-file-upload-interceptor.md | 11 +-
.../{file-upload.md => action-file-upload.md} | 202 +++-
source/core-developers/file-upload-interceptor.md | 9 +-
source/core-developers/file-upload.md | 52 +---
source/core-developers/interceptors.md | 82 ++---
source/css/main.css| 2 -
source/css/syntax.css | 273 +
source/highlighter/github-theme.css| 60
source/highlighter/js/shAutoloader.js | 17 --
source/highlighter/js/shBrushAS3.js| 59
source/highlighter/js/shBrushAppleScript.js| 75 -
source/highlighter/js/shBrushBash.js | 59
source/highlighter/js/shBrushCSharp.js | 65
source/highlighter/js/shBrushColdFusion.js | 100 --
source/highlighter/js/shBrushCpp.js| 97 --
source/highlighter/js/shBrushCss.js| 91 --
source/highlighter/js/shBrushDelphi.js | 55
source/highlighter/js/shBrushDiff.js | 41 ---
source/highlighter/js/shBrushErlang.js | 52
source/highlighter/js/shBrushGroovy.js | 67
source/highlighter/js/shBrushJScript.js| 52
source/highlighter/js/shBrushJava.js | 57
source/highlighter/js/shBrushJavaFX.js | 58
source/highlighter/js/shBrushPerl.js | 72 -
source/highlighter/js/shBrushPhp.js| 88 --
source/highlighter/js/shBrushPlain.js | 33 --
source/highlighter/js/shBrushPowerShell.js | 74 -
source/highlighter/js/shBrushPython.js | 64
source/highlighter/js/shBrushRuby.js | 55
source/highlighter/js/shBrushSass.js | 94 --
source/highlighter/js/shBrushScala.js | 51
source/highlighter/js/shBrushSql.js| 66
source/highlighter/js/shBrushVb.js | 56
source/highlighter/js/shBrushXml.js| 69 -
source/highlighter/js/shCore.js| 17 --
source/highlighter/js/shLegacy.js | 17 --
source/highlighter/style/shCore.css| 226 --
source/highlighter/style/shCoreDefault.css | 328
source/highlighter/style/shCoreDjango.css | 331
source/highlighter/style/shCoreEclipse.css | 339 -
source/highlighter/style/shCoreEmacs.css | 324
source/highlighter/style/shCoreFadeToGrey.css | 328
source/highlighter/style/shCoreMDUltra.css | 324
source/highlighter/style/shCoreMidnight.css| 324
source/highlighter/style/shCoreRDark.css | 324
source/highlighter/style/shCoreStruts.css | 339 -
source/highlighter/style/shThemeDefault.css| 117 ---
source/highlighter/style/shThemeDjango.css | 120
source/highlighter/style/shThemeEclipse.css| 128
source/highlighter/style/shThemeEmacs.css | 113 ---
source/highlighter/style/shThemeFadeToGrey.css | 117 ---
source/highlighter/style/shThemeMDUltra.css| 113 ---
source/highlighter/style/shThemeMidnight.css | 113 ---
source/highlighter/style/shThemeRDark.css | 113 ---
source/highlighter/style/shThemeStruts.css | 128
source/mail.md | 6 +-
source/updating-website.md | 199
62 files changed, 527 insertions(+), 6401 deletions(-)
(struts-site) branch fix/file-upload-navigation deleted (was bb53f2be5)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/file-upload-navigation in repository https://gitbox.apache.org/repos/asf/struts-site.git was bb53f2be5 Adds example with supporting multiple file uploads 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 (440ac19bf -> 675562186)
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 440ac19bf Merge pull request #231 from
apache/fix/file-upload-navigation
add 812ca70f7 Splits file upload page
add b537ecaa0 Drops useless highlighter
add 471ce2b5e Adds dedicate examples with different styles
add 5cc6d2313 Improves style
add bb53f2be5 Adds example with supporting multiple file uploads
new 675562186 Merge pull request #232 from
apache/fix/file-upload-navigation
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:
.gitignore | 3 +-
Gemfile.lock | 70 -
_config.yml| 4 +-
docker-arm64-serve.sh | 3 +
source/_layouts/default.html | 2 +-
.../action-file-upload-interceptor.md | 11 +-
.../{file-upload.md => action-file-upload.md} | 202 +++-
source/core-developers/file-upload-interceptor.md | 9 +-
source/core-developers/file-upload.md | 52 +---
source/core-developers/interceptors.md | 82 ++---
source/css/main.css| 2 -
source/css/syntax.css | 273 +
source/highlighter/github-theme.css| 60
source/highlighter/js/shAutoloader.js | 17 --
source/highlighter/js/shBrushAS3.js| 59
source/highlighter/js/shBrushAppleScript.js| 75 -
source/highlighter/js/shBrushBash.js | 59
source/highlighter/js/shBrushCSharp.js | 65
source/highlighter/js/shBrushColdFusion.js | 100 --
source/highlighter/js/shBrushCpp.js| 97 --
source/highlighter/js/shBrushCss.js| 91 --
source/highlighter/js/shBrushDelphi.js | 55
source/highlighter/js/shBrushDiff.js | 41 ---
source/highlighter/js/shBrushErlang.js | 52
source/highlighter/js/shBrushGroovy.js | 67
source/highlighter/js/shBrushJScript.js| 52
source/highlighter/js/shBrushJava.js | 57
source/highlighter/js/shBrushJavaFX.js | 58
source/highlighter/js/shBrushPerl.js | 72 -
source/highlighter/js/shBrushPhp.js| 88 --
source/highlighter/js/shBrushPlain.js | 33 --
source/highlighter/js/shBrushPowerShell.js | 74 -
source/highlighter/js/shBrushPython.js | 64
source/highlighter/js/shBrushRuby.js | 55
source/highlighter/js/shBrushSass.js | 94 --
source/highlighter/js/shBrushScala.js | 51
source/highlighter/js/shBrushSql.js| 66
source/highlighter/js/shBrushVb.js | 56
source/highlighter/js/shBrushXml.js| 69 -
source/highlighter/js/shCore.js| 17 --
source/highlighter/js/shLegacy.js | 17 --
source/highlighter/style/shCore.css| 226 --
source/highlighter/style/shCoreDefault.css | 328
source/highlighter/style/shCoreDjango.css | 331
source/highlighter/style/shCoreEclipse.css | 339 -
source/highlighter/style/shCoreEmacs.css | 324
source/highlighter/style/shCoreFadeToGrey.css | 328
source/highlighter/style/shCoreMDUltra.css | 324
source/highlighter/style/shCoreMidnight.css| 324
source/highlighter/style/shCoreRDark.css | 324
source/highlighter/style/shCoreStruts.css | 339 -
source/highlighter/style/shThemeDefault.css| 117 ---
source/highlighter/style/shThemeDjango.css | 120
source/highlighter/style/shThemeEclipse.css| 128
source/highlighter/style/shThemeEmacs.css | 113 ---
source/highlighter/style/shThemeFadeToGrey.css | 117 ---
source/highlighter/style/shThemeMDUltra.css| 113 ---
source/highlighter/style/shThemeMidnight.css | 113 ---
source/highlighter/style/shThemeRDark.css | 113 ---
source/highlighter/style/shThemeStruts.css | 128
source/mail.md | 6 +-
source/updating-website.md | 199
(struts) 01/01: Revert "WW-5251 remove deprecated interfaces related to ServletConfigInterceptor"
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch revert-670-issue/WW-5251
in repository https://gitbox.apache.org/repos/asf/struts.git
commit a4cf02ab96f4d0a02ff2bac3be51db57399db276
Author: Lukasz Lenart
AuthorDate: Tue Mar 26 09:02:54 2024 +0100
Revert "WW-5251 remove deprecated interfaces related to
ServletConfigInterceptor"
---
.../struts2/showcase/chat/ChatLoginAction.java | 13 +-
.../struts2/showcase/chat/ChatLogoutAction.java| 13 +-
.../struts2/showcase/chat/EnterRoomAction.java | 14 +-
.../struts2/showcase/chat/ExitRoomAction.java | 13 +-
.../showcase/chat/SendMessageToRoomAction.java | 12 +-
.../showcase/hangman/GetUpdatedHangmanAction.java | 14 +-
.../showcase/hangman/GuessCharacterAction.java | 14 +-
.../showcase/hangman/StartHangmanAction.java | 13 +-
.../apache/struts2/showcase/xslt/JVMAction.java| 13 +-
.../apache/struts2/dispatcher/HttpParameters.java | 7 +
.../struts2/interceptor/ApplicationAware.java | 45 +
.../struts2/interceptor/HttpParametersAware.java | 49 ++
.../apache/struts2/interceptor/ParameterAware.java | 50 ++
.../apache/struts2/interceptor/PrincipalAware.java | 38
.../apache/struts2/interceptor/RequestAware.java | 58 +++
.../interceptor/ServletConfigInterceptor.java | 85 +++--
.../struts2/interceptor/ServletRequestAware.java | 49 ++
.../struts2/interceptor/ServletResponseAware.java | 47 +
.../apache/struts2/interceptor/SessionAware.java | 47 +
.../apache/struts2/util/ServletContextAware.java | 36
.../interceptor/ServletConfigInterceptorTest.java | 192 +++--
.../dispatcher/DirectRenderFromEventAction.java| 10 +-
.../interceptor/PortletAwareInterceptor.java | 50 --
.../portlet/interceptor/PortletContextAware.java | 34
.../interceptor/PortletPreferencesAware.java | 42 +
.../portlet/interceptor/PortletRequestAware.java | 35
.../portlet/interceptor/PortletResponseAware.java | 35
.../interceptor/PortletAwareInterceptorTest.java | 31 +++-
.../interceptor/PortletStateInterceptorTest.java | 6 +-
29 files changed, 912 insertions(+), 153 deletions(-)
diff --git
a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
index 0dcfd8943..a5fc15e73 100644
---
a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
+++
b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
@@ -21,17 +21,16 @@
package org.apache.struts2.showcase.chat;
import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
import java.util.Map;
-import org.apache.struts2.action.SessionAware;
-
public class ChatLoginAction extends ActionSupport implements SessionAware {
private static final long serialVersionUID = 1L;
private ChatService chatService;
- private Map session;
+ private Map session;
private String name;
@@ -61,8 +60,8 @@ public class ChatLoginAction extends ActionSupport implements
SessionAware {
}
-@Override
-public void withSession(Map session) {
-this.session = session;
-}
+ // === SessionAware ===
+ public void setSession(Map session) {
+ this.session = session;
+ }
}
diff --git
a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
index 452ce0d08..d0c3e6ba6 100644
---
a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
+++
b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
@@ -21,18 +21,17 @@
package org.apache.struts2.showcase.chat;
import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
import java.util.Map;
-import org.apache.struts2.action.SessionAware;
-
public class ChatLogoutAction extends ActionSupport implements SessionAware {
private static final long serialVersionUID = 1L;
private ChatService chatService;
- private Map session;
+ private Map session;
public ChatLogoutAction(ChatService chatService) {
@@ -51,8 +50,8 @@ public class ChatLogoutAction extends ActionSupport
implements SessionAware {
}
-@Override
-public void withSession(Map session) {
-this.session = session;
-}
+ // === SessionAware ===
+ public void setSession(Map session) {
+ this.session = session;
+ }
}
diff --git
a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java
b/apps/showcase/src/main/java/org/apache/struts2/sho
(struts) branch revert-670-issue/WW-5251 created (now a4cf02ab9)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch revert-670-issue/WW-5251 in repository https://gitbox.apache.org/repos/asf/struts.git at a4cf02ab9 Revert "WW-5251 remove deprecated interfaces related to ServletConfigInterceptor" This branch includes the following new commits: new a4cf02ab9 Revert "WW-5251 remove deprecated interfaces related to ServletConfigInterceptor" 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 revert-670-issue/WW-5251 updated: WW-5251 Fixes compilation errors in test
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch revert-670-issue/WW-5251
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/revert-670-issue/WW-5251 by
this push:
new 21af6e597 WW-5251 Fixes compilation errors in test
21af6e597 is described below
commit 21af6e597bebe42e6aca9f45677ae0459c226879
Author: Lukasz Lenart
AuthorDate: Tue Mar 26 09:09:56 2024 +0100
WW-5251 Fixes compilation errors in test
---
.../interceptor/ServletConfigInterceptorTest.java | 35 ++
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git
a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
index 3cefbf18c..ec3f07e79 100644
---
a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
+++
b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
@@ -31,9 +31,6 @@ import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
@@ -51,14 +48,14 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
private ServletConfigInterceptor interceptor;
public void testServletRequestAware() throws Exception {
-ServletRequestAware mock = (ServletRequestAware)
createMock(ServletRequestAware.class);
+ServletRequestAware mock = createMock(ServletRequestAware.class);
MockHttpServletRequest req = new MockHttpServletRequest();
MockActionInvocation mai = createActionInvocation(mock);
mai.getInvocationContext().put(StrutsStatics.HTTP_REQUEST, req);
-mock.setServletRequest((HttpServletRequest) req);
+mock.setServletRequest(req);
expectLastCall();
replay(mock);
@@ -83,14 +80,14 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
}
public void testServletResponseAware() throws Exception {
-ServletResponseAware mock = (ServletResponseAware)
createMock(ServletResponseAware.class);
+ServletResponseAware mock = createMock(ServletResponseAware.class);
MockHttpServletResponse res = new MockHttpServletResponse();
MockActionInvocation mai = createActionInvocation(mock);
mai.getInvocationContext().put(StrutsStatics.HTTP_RESPONSE, res);
-mock.setServletResponse((HttpServletResponse) res);
+mock.setServletResponse(res);
expectLastCall().times(1);
replay(mock);
@@ -120,7 +117,7 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
HttpParameters param = HttpParameters.create().build();
-mai.getInvocationContext().setParameters(param);
+mai.getInvocationContext().withParameters(param);
param.applyParameters(mock);
expectLastCall().times(1);
@@ -136,7 +133,7 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
HttpParameters param = HttpParameters.create().build();
-mai.getInvocationContext().setParameters(param);
+mai.getInvocationContext().withParameters(param);
mock.setParameters(param);
expectLastCall().times(1);
@@ -163,12 +160,12 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
}
public void testSessionAware() throws Exception {
-SessionAware mock = (SessionAware) createMock(SessionAware.class);
+SessionAware mock = createMock(SessionAware.class);
MockActionInvocation mai = createActionInvocation(mock);
-Map session = new HashMap();
-mai.getInvocationContext().setSession(session);
+Map session = new HashMap<>();
+mai.getInvocationContext().withSession(session);
mock.setSession(session);
expectLastCall().times(1);
@@ -183,7 +180,7 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
-Map session = new HashMap();
+Map session = new HashMap<>();
mai.getInvocationContext().withSession(session);
mock.withSession(session);
@@ -199,7 +196,7 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
-Map app = new HashMap();
+Map app =
(struts) 01/01: WW-5251 Fixes compilation errors in test
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch revert-670-issue/WW-5251
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 2bba8ccd3e33101046970edf4732d937d2226037
Author: Lukasz Lenart
AuthorDate: Tue Mar 26 09:09:56 2024 +0100
WW-5251 Fixes compilation errors in test
---
.../interceptor/ServletConfigInterceptorTest.java | 35 ++
.../interceptor/PortletStateInterceptorTest.java | 6 ++--
2 files changed, 19 insertions(+), 22 deletions(-)
diff --git
a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
index 3cefbf18c..ec3f07e79 100644
---
a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
+++
b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
@@ -31,9 +31,6 @@ import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
@@ -51,14 +48,14 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
private ServletConfigInterceptor interceptor;
public void testServletRequestAware() throws Exception {
-ServletRequestAware mock = (ServletRequestAware)
createMock(ServletRequestAware.class);
+ServletRequestAware mock = createMock(ServletRequestAware.class);
MockHttpServletRequest req = new MockHttpServletRequest();
MockActionInvocation mai = createActionInvocation(mock);
mai.getInvocationContext().put(StrutsStatics.HTTP_REQUEST, req);
-mock.setServletRequest((HttpServletRequest) req);
+mock.setServletRequest(req);
expectLastCall();
replay(mock);
@@ -83,14 +80,14 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
}
public void testServletResponseAware() throws Exception {
-ServletResponseAware mock = (ServletResponseAware)
createMock(ServletResponseAware.class);
+ServletResponseAware mock = createMock(ServletResponseAware.class);
MockHttpServletResponse res = new MockHttpServletResponse();
MockActionInvocation mai = createActionInvocation(mock);
mai.getInvocationContext().put(StrutsStatics.HTTP_RESPONSE, res);
-mock.setServletResponse((HttpServletResponse) res);
+mock.setServletResponse(res);
expectLastCall().times(1);
replay(mock);
@@ -120,7 +117,7 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
HttpParameters param = HttpParameters.create().build();
-mai.getInvocationContext().setParameters(param);
+mai.getInvocationContext().withParameters(param);
param.applyParameters(mock);
expectLastCall().times(1);
@@ -136,7 +133,7 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
HttpParameters param = HttpParameters.create().build();
-mai.getInvocationContext().setParameters(param);
+mai.getInvocationContext().withParameters(param);
mock.setParameters(param);
expectLastCall().times(1);
@@ -163,12 +160,12 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
}
public void testSessionAware() throws Exception {
-SessionAware mock = (SessionAware) createMock(SessionAware.class);
+SessionAware mock = createMock(SessionAware.class);
MockActionInvocation mai = createActionInvocation(mock);
-Map session = new HashMap();
-mai.getInvocationContext().setSession(session);
+Map session = new HashMap<>();
+mai.getInvocationContext().withSession(session);
mock.setSession(session);
expectLastCall().times(1);
@@ -183,7 +180,7 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
-Map session = new HashMap();
+Map session = new HashMap<>();
mai.getInvocationContext().withSession(session);
mock.withSession(session);
@@ -199,7 +196,7 @@ public class ServletConfigInterceptorTest extends
StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
-Map app = new HashMap();
+Map app = new HashMap<>();
mai.getInvocationContext().withApplication(app);
mock.setApplication(app);
@@ -230,7 +227
(struts) branch revert-670-issue/WW-5251 updated (21af6e597 -> 2bba8ccd3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch revert-670-issue/WW-5251 in repository https://gitbox.apache.org/repos/asf/struts.git discard 21af6e597 WW-5251 Fixes compilation errors in test new 2bba8ccd3 WW-5251 Fixes compilation errors in test 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 (21af6e597) \ N -- N -- N refs/heads/revert-670-issue/WW-5251 (2bba8ccd3) 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/portlet/interceptor/PortletStateInterceptorTest.java| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(struts-site) branch master updated (675562186 -> 5ab183fd3)
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 675562186 Merge pull request #232 from apache/fix/file-upload-navigation add 0d2337395 Update index.md for StrutsTilesListener new 5ab183fd3 Merge pull request #233 from sclaup/patch-1 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/tiles/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-site) 01/01: Merge pull request #233 from sclaup/patch-1
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 5ab183fd3dd4a3ea165570ec0dbca0324b07a98f Merge: 675562186 0d2337395 Author: Lukasz Lenart AuthorDate: Thu Mar 28 12:51:55 2024 +0100 Merge pull request #233 from sclaup/patch-1 Update index.md for StrutsTilesListener source/plugins/tiles/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-intellij-plugin) branch feature/ip-clearance updated (1b64e8a -> ebf5cc1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/ip-clearance in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 1b64e8a Upgrades to the latest IDEA version add ebf5cc1 Uses proper build task No new revisions were added by this update. Summary of changes: .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-intellij-plugin) branch feature/ip-clearance updated (ebf5cc1 -> bc89d7e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/ip-clearance in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git omit ebf5cc1 Uses proper build task add bc89d7e Uses proper build task 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 (ebf5cc1) \ N -- N -- N refs/heads/feature/ip-clearance (bc89d7e) 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: build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch feature/codeowners-review created (now 6950fcb75)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/codeowners-review in repository https://gitbox.apache.org/repos/asf/struts.git at 6950fcb75 Enables required review by codeowners This branch includes the following new commits: new 6950fcb75 Enables required review by codeowners 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: Enables required review by codeowners
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/codeowners-review
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 6950fcb75f68834fc913cba78c427f10a31cc402
Author: Lukasz Lenart
AuthorDate: Sat Mar 30 08:36:50 2024 +0100
Enables required review by codeowners
---
.asf.yaml | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/.asf.yaml b/.asf.yaml
index 673c6e25c..ed31174c3 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -13,7 +13,13 @@ notifications:
github:
del_branch_on_merge: true
protected_branches:
-master: { }
+master:
+ # contexts are the names of checks that must pass.
+ contexts:
+- Java Maven / Build and Test
+ required_pull_request_reviews:
+require_code_owner_reviews: true
+required_approving_review_count: 1
autolink_jira:
- WW
dependabot_alerts: true
(struts) branch master updated (cdc931e26 -> 7281d7e2e)
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 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
new 7281d7e2e Merge pull request #898 from apache/WW-5251-retrofit-compat
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/interceptor/ApplicationAware.java} | 18 ++---
.../struts2/interceptor/HttpParametersAware.java} | 18 ++---
.../struts2/interceptor/ParameterAware.java} | 27 ++-
.../struts2/interceptor/PrincipalAware.java} | 16 +--
.../RequestAware.java} | 31 +++---
.../struts2/interceptor/ServletRequestAware.java} | 18 ++---
.../struts2/interceptor/ServletResponseAware.java} | 18 ++---
.../apache/struts2/interceptor/SessionAware.java} | 18 ++---
.../{action => util}/ServletContextAware.java | 17 ++--
.../portlet/interceptor/PortletContextAware.java} | 15 +++
.../interceptor/PortletPreferencesAware.java | 23 +---
.../PortletRequestAware.java | 14 +-
.../PortletResponseAware.java | 14 +-
13 files changed, 117 insertions(+), 130 deletions(-)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ApplicationAware.java} (74%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/HttpParametersAware.java} (73%)
copy core/src/main/java/{com/opensymphony/xwork2/LocaleProviderFactory.java =>
org/apache/struts2/interceptor/ParameterAware.java} (65%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/PrincipalAware.java} (75%)
copy
core/src/main/java/org/apache/struts2/{views/freemarker/tags/DateModel.java =>
interceptor/RequestAware.java} (61%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ServletRequestAware.java} (72%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ServletResponseAware.java} (71%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/SessionAware.java} (76%)
copy core/src/main/java/org/apache/struts2/{action =>
util}/ServletContextAware.java (73%)
copy
plugins/{rest/src/main/java/org/apache/struts2/rest/handler/xstream/XStreamPermissionProvider.java
=>
portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java}
(72%)
copy core/src/test/java/com/opensymphony/xwork2/VoidResult.java =>
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java
(69%)
copy plugins/portlet/src/main/java/org/apache/struts2/portlet/{action =>
interceptor}/PortletRequestAware.java (71%)
copy plugins/portlet/src/main/java/org/apache/struts2/portlet/{action =>
interceptor}/PortletResponseAware.java (71%)
(struts) 01/01: Merge pull request #898 from apache/WW-5251-retrofit-compat
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 7281d7e2ee49cfcb0c0d3f5723fa9b2ca7466ad6 Merge: cdc931e26 dc774c484 Author: Lukasz Lenart AuthorDate: Sat Mar 30 08:52:41 2024 +0100 Merge pull request #898 from apache/WW-5251-retrofit-compat WW-5251 Reinstate deleted interfaces with transparent compat .../struts2/interceptor/ApplicationAware.java | 32 + .../struts2/interceptor/HttpParametersAware.java | 32 + .../apache/struts2/interceptor/ParameterAware.java | 36 +++ .../apache/struts2/interceptor/PrincipalAware.java | 30 .../apache/struts2/interceptor/RequestAware.java | 41 ++ .../struts2/interceptor/ServletRequestAware.java | 32 + .../struts2/interceptor/ServletResponseAware.java | 32 + .../apache/struts2/interceptor/SessionAware.java | 32 + .../apache/struts2/util/ServletContextAware.java | 32 + .../portlet/interceptor/PortletContextAware.java | 32 + .../interceptor/PortletPreferencesAware.java | 32 + .../portlet/interceptor/PortletRequestAware.java | 32 + .../portlet/interceptor/PortletResponseAware.java | 32 + 13 files changed, 427 insertions(+)
(struts) branch WW-5251-retrofit-compat deleted (was dc774c484)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5251-retrofit-compat in repository https://gitbox.apache.org/repos/asf/struts.git was dc774c484 WW-5251 Reinstate RequestAware 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 #899 from apache/feature/codeowners-review
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 66c1ac431f74cd6b7dcdea904546fe465aae29ac Merge: 7281d7e2e 6950fcb75 Author: Lukasz Lenart AuthorDate: Sat Mar 30 10:33:53 2024 +0100 Merge pull request #899 from apache/feature/codeowners-review Enables required review by codeowners .asf.yaml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
(struts) branch master updated (7281d7e2e -> 66c1ac431)
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 7281d7e2e Merge pull request #898 from apache/WW-5251-retrofit-compat add 6950fcb75 Enables required review by codeowners new 66c1ac431 Merge pull request #899 from apache/feature/codeowners-review 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: .asf.yaml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
(struts) branch feature/codeowners-review deleted (was 6950fcb75)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/codeowners-review in repository https://gitbox.apache.org/repos/asf/struts.git was 6950fcb75 Enables required review by codeowners 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 revert-670-issue/WW-5251 deleted (was 2bba8ccd3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch revert-670-issue/WW-5251 in repository https://gitbox.apache.org/repos/asf/struts.git was 2bba8ccd3 WW-5251 Fixes compilation errors in test 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 #900 from apache/WW-5251-retrofit-compat
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 c774e23ef913ad80f90d9f223d2ac0baef3ed25b Merge: 66c1ac431 93c11aaf6 Author: Lukasz Lenart AuthorDate: Sun Mar 31 11:35:52 2024 +0200 Merge pull request #900 from apache/WW-5251-retrofit-compat WW-5251 Fix deprecated interface method signature core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch master updated (66c1ac431 -> c774e23ef)
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 66c1ac431 Merge pull request #899 from apache/feature/codeowners-review add 93c11aaf6 WW-5251 Fix deprecated interface method signature new c774e23ef Merge pull request #900 from apache/WW-5251-retrofit-compat 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: core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch WW-5251-retrofit-compat deleted (was 93c11aaf6)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5251-retrofit-compat in repository https://gitbox.apache.org/repos/asf/struts.git was 93c11aaf6 WW-5251 Fix deprecated interface method signature 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: Uses proper context name in branch protection rule
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/branch-protction in repository https://gitbox.apache.org/repos/asf/struts.git commit 273c3a1a998c5933370cb3346a72c9935c2063db Author: Lukasz Lenart AuthorDate: Sun Mar 31 11:36:49 2024 +0200 Uses proper context name in branch protection rule --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index ed31174c3..87706aa57 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -16,7 +16,7 @@ github: master: # contexts are the names of checks that must pass. contexts: -- Java Maven / Build and Test +- build required_pull_request_reviews: require_code_owner_reviews: true required_approving_review_count: 1
(struts) branch fix/branch-protction created (now 273c3a1a9)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/branch-protction in repository https://gitbox.apache.org/repos/asf/struts.git at 273c3a1a9 Uses proper context name in branch protection rule This branch includes the following new commits: new 273c3a1a9 Uses proper context name in branch protection rule 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 feature/WW-5402-autoload-classptah updated (885c9a51e -> 3e1c6f99f)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
omit 885c9a51e WW-5402 Auto loads Tiles definitions from classpath
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
new 3e1c6f99f WW-5402 Auto loads Tiles definitions from classpath
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 (885c9a51e)
\
N -- N -- N refs/heads/feature/WW-5402-autoload-classptah
(3e1c6f99f)
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:
.asf.yaml | 8 +-
.../struts2/interceptor/ApplicationAware.java} | 18 ++---
.../struts2/interceptor/HttpParametersAware.java} | 18 ++---
.../struts2/interceptor/ParameterAware.java} | 27 ++-
.../struts2/interceptor/PrincipalAware.java} | 16 +--
.../RequestAware.java} | 31 +++---
.../struts2/interceptor/ServletRequestAware.java} | 18 ++---
.../struts2/interceptor/ServletResponseAware.java} | 18 ++---
.../apache/struts2/interceptor/SessionAware.java} | 18 ++---
.../{action => util}/ServletContextAware.java | 17 ++--
.../portlet/interceptor/PortletContextAware.java} | 15 +++
.../interceptor/PortletPreferencesAware.java | 23 +---
.../PortletRequestAware.java | 14 +-
.../PortletResponseAware.java | 14 +-
14 files changed, 124 insertions(+), 131 deletions(-)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ApplicationAware.java} (74%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/HttpParametersAware.java} (73%)
copy core/src/main/java/{com/opensymphony/xwork2/LocaleProviderFactory.java =>
org/apache/struts2/interceptor/ParameterAware.java} (65%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/PrincipalAware.java} (75%)
copy
core/src/main/java/org/apache/struts2/{views/freemarker/tags/DateModel.java =>
interceptor/RequestAware.java} (61%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ServletRequestAware.java} (72%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ServletResponseAware.java} (71%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/SessionAware.java} (76%)
copy core/src/main/java/org/apache/struts2/{action =>
util}/ServletContextAware.java (73%)
copy
plugins/{rest/src/main/java/org/apache/struts2/rest/handler/xstream/XStreamPermissionProvider.java
=>
portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java}
(72%)
copy core/src/test/java/com/opensymphony/xwork2/VoidResult.java =>
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java
(69%)
copy plugins/portlet/src/main/java/org/apache/struts2/portlet/{action =>
interceptor}/PortletRequestAware.java (71%)
copy plugins/portlet/src/main/java/org/apache/struts2/portlet/{action =>
interceptor}/PortletResponseAware.java (71%)
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 3e1c6f99fa7ebfe1f1c1a3c23ff64b81b13f0631
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 25 ++--
.../tiles/StrutsTilesContainerFactoryTest.java | 128 +
3 files changed, 146 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
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 205476467..d1b1a4f52 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
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -69,6 +69,7 @@ import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -100,10 +101,20 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * 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 String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS = new
HashSet() {{
+add("/WEB-INF/**/tiles*.xml");
+add("classpath*:META-INF/**/tiles*.xml");
+}};
/**
* Supported expression languages
@@ -213,7 +224,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..122bfe51d
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit c7ae614824b4c158b9998575294d94fe9a746c41
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 28 +++--
.../tiles/StrutsTilesContainerFactoryTest.java | 128 +
3 files changed, 149 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
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 205476467..ed03f8268 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
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -68,7 +68,10 @@ 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;
@@ -100,10 +103,21 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * 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 String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+"/WEB-INF/**/tiles*.xml",
+"classpath*:META-INF/**/tiles*.xml"
+)));
/**
* Supported expression languages
@@ -213,7 +227,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..122bfe51d
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.ja
(struts) branch feature/WW-5402-autoload-classptah updated (3e1c6f99f -> c7ae61482)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah in repository https://gitbox.apache.org/repos/asf/struts.git discard 3e1c6f99f WW-5402 Auto loads Tiles definitions from classpath new c7ae61482 WW-5402 Auto loads Tiles definitions from classpath 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 (3e1c6f99f) \ N -- N -- N refs/heads/feature/WW-5402-autoload-classptah (c7ae61482) 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: .../org/apache/struts2/tiles/StrutsTilesContainerFactory.java | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-)
(struts) branch feature/WW-5402-autoload-classptah deleted (was c7ae61482)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah in repository https://gitbox.apache.org/repos/asf/struts.git was c7ae61482 WW-5402 Auto loads Tiles definitions from classpath 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 (c774e23ef -> 689d17d27)
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 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 No new revisions were added by this update. Summary of changes: plugins/tiles/pom.xml | 3 - .../struts2/tiles/StrutsTilesContainerFactory.java | 28 +++-- .../tiles/StrutsTilesContainerFactoryTest.java | 128 + 3 files changed, 149 insertions(+), 10 deletions(-) create mode 100644 plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
(struts) 01/01: Merge pull request #901 from apache/fix/branch-protction
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 5cf746f538bdf6848142c4393e98cb186a152131 Merge: 689d17d27 273c3a1a9 Author: Lukasz Lenart AuthorDate: Tue Apr 2 15:01:10 2024 +0200 Merge pull request #901 from apache/fix/branch-protction Uses proper context name in branch protection rule .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch fix/branch-protction deleted (was 273c3a1a9)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/branch-protction in repository https://gitbox.apache.org/repos/asf/struts.git was 273c3a1a9 Uses proper context name in branch protection rule 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 (689d17d27 -> 5cf746f53)
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 689d17d27 Merge pull request #896 from apache/feature/WW-5402-autoload-classptah add 273c3a1a9 Uses proper context name in branch protection rule new 5cf746f53 Merge pull request #901 from apache/fix/branch-protction 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: .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch dependabot/maven/org.mockito-mockito-core-5.11.0 deleted (was b3723fa6d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.mockito-mockito-core-5.11.0 in repository https://gitbox.apache.org/repos/asf/struts.git was b3723fa6d Bump org.mockito:mockito-core from 4.3.1 to 5.11.0 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 dependabot/maven/org.testng-testng-7.9.0 deleted (was 2d8727835)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.testng-testng-7.9.0 in repository https://gitbox.apache.org/repos/asf/struts.git was 2d8727835 Bump org.testng:testng from 7.5.1 to 7.9.0 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 dependabot/maven/org.apache.rat-apache-rat-plugin-0.16.1 deleted (was 2e9f238ce)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.apache.rat-apache-rat-plugin-0.16.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 2e9f238ce Bump org.apache.rat:apache-rat-plugin from 0.15 to 0.16.1 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 dependabot/maven/org.apache.juneau-juneau-marshall-9.0.1 deleted (was 6a9cc6e10)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.apache.juneau-juneau-marshall-9.0.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 6a9cc6e10 Bump org.apache.juneau:juneau-marshall from 8.1.3 to 9.0.1 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 #902 from apache/dependabot/maven/log4j2.version-2.23.1
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 ee38cd5b1472ed96cff90636d2b72fe165eedadb Merge: 5cf746f53 7a79576bb Author: Lukasz Lenart AuthorDate: Sat Apr 6 18:45:12 2024 +0200 Merge pull request #902 from apache/dependabot/maven/log4j2.version-2.23.1 WW-5404 Bump log4j2.version from 2.21.1 to 2.23.1 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch master updated (5cf746f53 -> ee38cd5b1)
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 5cf746f53 Merge pull request #901 from apache/fix/branch-protction add 7a79576bb Bump log4j2.version from 2.21.1 to 2.23.1 new ee38cd5b1 Merge pull request #902 from apache/dependabot/maven/log4j2.version-2.23.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch dependabot/maven/log4j2.version-2.23.1 deleted (was 7a79576bb)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/log4j2.version-2.23.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 7a79576bb Bump log4j2.version from 2.21.1 to 2.23.1 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-master) branch master updated (a87b03a -> 1c85154)
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-master.git from a87b03a [maven-release-plugin] prepare for next development iteration new 7b0bb25 Uses Apache Master 31 version new 1c85154 [maven-release-plugin] prepare release STRUTS_MASTER_15 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: pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(struts-master) 02/02: [maven-release-plugin] prepare release STRUTS_MASTER_15
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 1c851543c49e77b461116f14347968460fb50014 Author: Lukasz Lenart AuthorDate: Sat Apr 6 19:10:32 2024 +0200 [maven-release-plugin] prepare release STRUTS_MASTER_15 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a2d14c4..9f94f85 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.apache.struts struts-master -15-SNAPSHOT +15 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/ -HEAD +STRUTS_MASTER_15
(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
(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) 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) 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) 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) 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) 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) 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) 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.mul
(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) 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 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 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 (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) 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 --- a
(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) 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
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
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: 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
(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.
(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/Parameter
(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: [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) 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 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
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/
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/
(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(-)
(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) 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: [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) 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) 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) 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) 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) 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 --- a
(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(-)
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/
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: 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: 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/
