(struts) branch WW-5376-bom-fix updated (9284b742f -> 7a37de1ab)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5376-bom-fix in repository https://gitbox.apache.org/repos/asf/struts.git discard 9284b742f WW-5376 Fix BOM leaking unrelated dependencies add 7a37de1ab WW-5376 Fix BOM leaking unrelated dependencies 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 (9284b742f) \ N -- N -- N refs/heads/WW-5376-bom-fix (7a37de1ab) 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: apps/pom.xml | 3 +- assembly/pom.xml | 1 + bom/README.md| 20 bom/pom.xml | 168 -- core/pom.xml | 1 + jakarta/pom.xml | 1 + parent/pom.xml | 305 +++ plugins/pom.xml | 1 + pom.xml | 280 +++--- 9 files changed, 370 insertions(+), 410 deletions(-) delete mode 100644 bom/README.md delete mode 100644 bom/pom.xml create mode 100644 parent/pom.xml
(struts) branch WW-5376-bom-fix updated (7a37de1ab -> 4c0886311)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5376-bom-fix in repository https://gitbox.apache.org/repos/asf/struts.git discard 7a37de1ab WW-5376 Fix BOM leaking unrelated dependencies add 4c0886311 WW-5376 Fix BOM leaking unrelated dependencies 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 (7a37de1ab) \ N -- N -- N refs/heads/WW-5376-bom-fix (4c0886311) 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, 2 deletions(-)
(struts) branch WW-5376-bom-fix updated (4c0886311 -> 730d5ae78)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5376-bom-fix in repository https://gitbox.apache.org/repos/asf/struts.git discard 4c0886311 WW-5376 Fix BOM leaking unrelated dependencies add 730d5ae78 WW-5376 Fix BOM leaking unrelated dependencies 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 (4c0886311) \ N -- N -- N refs/heads/WW-5376-bom-fix (730d5ae78) 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: bom/README.md | 20 bom/pom.xml| 146 + parent/pom.xml | 6 +-- pom.xml| 113 +--- 4 files changed, 171 insertions(+), 114 deletions(-) create mode 100644 bom/README.md create mode 100644 bom/pom.xml
(struts) branch WW-5376-bom-fix updated (730d5ae78 -> d2cb444bc)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5376-bom-fix in repository https://gitbox.apache.org/repos/asf/struts.git omit 730d5ae78 WW-5376 Fix BOM leaking unrelated dependencies add d2cb444bc WW-5376 Fix BOM leaking unrelated dependencies 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 (730d5ae78) \ N -- N -- N refs/heads/WW-5376-bom-fix (d2cb444bc) 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: bom/pom.xml | 5 + 1 file changed, 5 insertions(+)
(struts) branch dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-3.1.1 deleted (was 653d73896)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-3.1.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 653d73896 Bump jakarta.servlet.jsp:jakarta.servlet.jsp-api from 3.1.0 to 3.1.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 main updated (84cf66604 -> 15ee2ac4a)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts.git from 84cf66604 Bump ossf/scorecard-action from 2.4.0 to 2.4.1 (#1229) add 077e98589 WW-5532 Upgrade and align various dependencies new 15ee2ac4a Merge pull request #1232 from apache/WW-5532-upg-deps 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: apps/pom.xml | 1 - .../struts2/showcase/StrutsParametersTest.java | 3 +- core/pom.xml | 1 + plugins/bean-validation/pom.xml| 15 +- plugins/cdi/pom.xml| 21 +- .../apache/struts2/cdi/CdiObjectFactoryTest.java | 37 ++- plugins/jfreechart/pom.xml | 4 +- .../apache/struts2/dispatcher/ChartResultTest.java | 116 +++-- plugins/junit/pom.xml | 1 + plugins/rest/pom.xml | 1 + plugins/testng/pom.xml | 1 + plugins/tiles/pom.xml | 14 +- plugins/velocity/pom.xml | 9 +- .../template/VelocityTemplateEngineTest.java | 51 ++-- pom.xml| 280 ++--- 15 files changed, 197 insertions(+), 358 deletions(-)
(struts) branch WW-5532-upg-deps deleted (was 077e98589)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5532-upg-deps in repository https://gitbox.apache.org/repos/asf/struts.git was 077e98589 WW-5532 Upgrade and align various dependencies 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.jboss.weld-weld-core-impl-6.0.1.Final deleted (was a89cdeece)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.jboss.weld-weld-core-impl-6.0.1.Final in repository https://gitbox.apache.org/repos/asf/struts.git was a89cdeece Bump org.jboss.weld:weld-core-impl from 5.1.2.Final to 6.0.1.Final 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 #1232 from apache/WW-5532-upg-deps
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts.git commit 15ee2ac4a04ba5d438c171c8772a9fffee66e44e Merge: 84cf66604 077e98589 Author: Kusal Kithul-Godage AuthorDate: Tue Feb 25 19:34:39 2025 +1100 Merge pull request #1232 from apache/WW-5532-upg-deps WW-5532 Upgrade and align various dependencies apps/pom.xml | 1 - .../struts2/showcase/StrutsParametersTest.java | 3 +- core/pom.xml | 1 + plugins/bean-validation/pom.xml| 15 +- plugins/cdi/pom.xml| 21 +- .../apache/struts2/cdi/CdiObjectFactoryTest.java | 37 ++- plugins/jfreechart/pom.xml | 4 +- .../apache/struts2/dispatcher/ChartResultTest.java | 116 +++-- plugins/junit/pom.xml | 1 + plugins/rest/pom.xml | 1 + plugins/testng/pom.xml | 1 + plugins/tiles/pom.xml | 14 +- plugins/velocity/pom.xml | 9 +- .../template/VelocityTemplateEngineTest.java | 51 ++-- pom.xml| 280 ++--- 15 files changed, 197 insertions(+), 358 deletions(-)
(struts) branch dependabot/maven/weld.version-6.0.1.Final created (now 2081a0112)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/weld.version-6.0.1.Final in repository https://gitbox.apache.org/repos/asf/struts.git at 2081a0112 Bump weld.version from 5.1.2.Final to 6.0.1.Final No new revisions were added by this update.
(struts) branch dependabot/maven/org.jboss.weld.se-weld-se-core-6.0.1.Final deleted (was 029fba63b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.jboss.weld.se-weld-se-core-6.0.1.Final in repository https://gitbox.apache.org/repos/asf/struts.git was 029fba63b Bump org.jboss.weld.se:weld-se-core from 5.1.2.Final to 6.0.1.Final 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 WW-5533-jee11-supp updated (dfd54c96f -> 720a8b614)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5533-jee11-supp in repository https://gitbox.apache.org/repos/asf/struts.git discard dfd54c96f WW-5533 Add compilation support for Jakarta EE 11 add d2cb444bc WW-5376 Fix BOM leaking unrelated dependencies add 720a8b614 WW-5533 Add compilation support for Jakarta EE 11 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 (dfd54c96f) \ N -- N -- N refs/heads/WW-5533-jee11-supp (720a8b614) 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: apps/pom.xml | 3 +- assembly/pom.xml | 1 + bom/pom.xml | 71 +-- core/pom.xml | 1 + jakarta/pom.xml | 1 + parent/pom.xml | 305 +++ plugins/pom.xml | 1 + pom.xml | 355 +-- 8 files changed, 340 insertions(+), 398 deletions(-) create mode 100644 parent/pom.xml
(struts) branch main updated: WW-5530 make DateConverter work for LocalDate and LocalTime (#1223)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/main by this push:
new 0d2d11071 WW-5530 make DateConverter work for LocalDate and LocalTime
(#1223)
0d2d11071 is described below
commit 0d2d11071bb0ff8c7e0ec19c85260df42823fc51
Author: bill-humblcloud
AuthorDate: Wed Feb 26 02:29:36 2025 -0500
WW-5530 make DateConverter work for LocalDate and LocalTime (#1223)
* make DateConverter work for LocalDate and LocalTime
* add date tests
---
.../conversion/impl/XWorkBasicConverter.java | 6 +
.../conversion/impl/XWorkConverterTest.java| 27 ++
2 files changed, 33 insertions(+)
diff --git
a/core/src/main/java/org/apache/struts2/conversion/impl/XWorkBasicConverter.java
b/core/src/main/java/org/apache/struts2/conversion/impl/XWorkBasicConverter.java
index c270a4bcd..281e36380 100644
---
a/core/src/main/java/org/apache/struts2/conversion/impl/XWorkBasicConverter.java
+++
b/core/src/main/java/org/apache/struts2/conversion/impl/XWorkBasicConverter.java
@@ -25,7 +25,9 @@ import org.apache.struts2.StrutsConstants;
import org.apache.struts2.conversion.TypeConversionException;
import java.lang.reflect.Member;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
@@ -100,8 +102,12 @@ public class XWorkBasicConverter extends
DefaultTypeConverter {
result = doConvertToArray(context, o, member, propertyName, value,
toType);
} else if (Date.class.isAssignableFrom(toType)) {
result = doConvertToDate(context, value, toType);
+} else if (LocalDate.class.isAssignableFrom(toType)) {
+result = doConvertToDate(context, value, toType);
} else if (LocalDateTime.class.isAssignableFrom(toType)) {
result = doConvertToDate(context, value, toType);
+} else if (LocalTime.class.isAssignableFrom(toType)) {
+result = doConvertToDate(context, value, toType);
} else if (Calendar.class.isAssignableFrom(toType)) {
result = doConvertToCalendar(context, value);
} else if (Collection.class.isAssignableFrom(toType)) {
diff --git
a/core/src/test/java/org/apache/struts2/conversion/impl/XWorkConverterTest.java
b/core/src/test/java/org/apache/struts2/conversion/impl/XWorkConverterTest.java
index bdf2a2365..256d9b231 100644
---
a/core/src/test/java/org/apache/struts2/conversion/impl/XWorkConverterTest.java
+++
b/core/src/test/java/org/apache/struts2/conversion/impl/XWorkConverterTest.java
@@ -50,6 +50,10 @@ import java.util.*;
import static org.junit.Assert.assertArrayEquals;
+import java.time.format.DateTimeFormatter;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.Date;
import java.util.Set;
@@ -100,6 +104,29 @@ public class XWorkConverterTest extends XWorkTestCase {
Date dateRfc3339DateOnly = (Date) converter.convertValue(context,
null, null, null, "2001-01-10", Date.class);
assertEquals(date, dateRfc3339DateOnly);
+
+// java.time library tests
+DateTimeFormatter formatterDate =
DateTimeFormatter.ofPattern("MM/dd/");
+LocalDate localDate = LocalDate.parse("01/10/2001", formatterDate);
+
+DateTimeFormatter formatterDateTime =
DateTimeFormatter.ofPattern("-MM-dd'T'HH:mm:ss");
+LocalDateTime localDateTime =
LocalDateTime.parse("2001-01-10T10:11:12", formatterDateTime);
+
+DateTimeFormatter formatterTime =
DateTimeFormatter.ofPattern("HH:mm:ss");
+LocalTime localTime = LocalTime.parse("10:11:12", formatterTime);
+
+String localDateStr = (String) converter.convertValue(context, null,
null, null, localDate, String.class);
+String localDateTimeStr = (String) converter.convertValue(context,
null, null, null, localDateTime, String.class);
+String localTimeStr = (String) converter.convertValue(context, null,
null, null, localTime, String.class);
+
+LocalDate localDate2 = (LocalDate) converter.convertValue(context,
null, null, null, localDateStr, LocalDate.class);
+assertEquals(localDate, localDate2);
+
+LocalDateTime localDateTime2 = (LocalDateTime)
converter.convertValue(context, null, null, null, localDateTimeStr,
LocalDateTime.class);
+assertEquals(localDateTime, localDateTime2);
+
+LocalTime localTime2 = (LocalTime) converter.convertValue(context,
null, null, null, localTimeStr, LocalTime.class);
+assertEquals(localTime, localTime2);
}
public void testDateConversionWithDefault() throws ParseException {
(struts) branch WW-5376-bom-fix deleted (was d2cb444bc)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5376-bom-fix in repository https://gitbox.apache.org/repos/asf/struts.git was d2cb444bc WW-5376 Fix BOM leaking unrelated dependencies 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 #1234 from apache/WW-5376-bom-fix
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts.git commit 2ab0a3c84389ae5b4b4a1eb765f03cec4b874e0f Merge: 15ee2ac4a d2cb444bc Author: Kusal Kithul-Godage AuthorDate: Tue Feb 25 22:16:05 2025 +1100 Merge pull request #1234 from apache/WW-5376-bom-fix WW-5376 Fix BOM leaking unrelated dependencies apps/pom.xml | 3 +- assembly/pom.xml | 1 + bom/pom.xml | 71 +-- core/pom.xml | 1 + jakarta/pom.xml | 1 + parent/pom.xml | 305 +++ plugins/pom.xml | 1 + pom.xml | 355 +-- 8 files changed, 340 insertions(+), 398 deletions(-)
(struts) branch main updated (2ab0a3c84 -> 1100a34e9)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts.git from 2ab0a3c84 Merge pull request #1234 from apache/WW-5376-bom-fix add fa951718d WW-5533 Add compilation support for Jakarta EE 11 add 1100a34e9 Merge pull request #1233 from apache/WW-5533-jee11-supp No new revisions were added by this update. Summary of changes: .github/workflows/maven.yml | 17 - .../multipart/AbstractMultiPartRequestTest.java | 1 - .../main/java/org/apache/tiles/el/ScopeELResolver.java | 2 +- .../org/apache/tiles/el/TilesContextBeanELResolver.java | 2 +- .../org/apache/tiles/el/TilesContextELResolver.java | 2 +- pom.xml | 7 +++ 6 files changed, 22 insertions(+), 9 deletions(-)
(struts) branch WW-5533-jee11-supp deleted (was fa951718d)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5533-jee11-supp in repository https://gitbox.apache.org/repos/asf/struts.git was fa951718d WW-5533 Add compilation support for Jakarta EE 11 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 main updated (15ee2ac4a -> 2ab0a3c84)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts.git from 15ee2ac4a Merge pull request #1232 from apache/WW-5532-upg-deps add d2cb444bc WW-5376 Fix BOM leaking unrelated dependencies new 2ab0a3c84 Merge pull request #1234 from apache/WW-5376-bom-fix 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: apps/pom.xml | 3 +- assembly/pom.xml | 1 + bom/pom.xml | 71 +-- core/pom.xml | 1 + jakarta/pom.xml | 1 + parent/pom.xml | 305 +++ plugins/pom.xml | 1 + pom.xml | 355 +-- 8 files changed, 340 insertions(+), 398 deletions(-) create mode 100644 parent/pom.xml
(struts) branch WW-5533-jee11-supp updated (720a8b614 -> fa951718d)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5533-jee11-supp in repository https://gitbox.apache.org/repos/asf/struts.git omit 720a8b614 WW-5533 Add compilation support for Jakarta EE 11 add fa951718d WW-5533 Add compilation support for Jakarta EE 11 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 (720a8b614) \ N -- N -- N refs/heads/WW-5533-jee11-supp (fa951718d) 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: .../struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java | 1 - plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java| 2 +- .../src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java | 2 +- .../tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-)
