commit 3db16c8f24cebd62debfb4f9f18692422f4a7071
author Lukasz Lenart <lukaszlenart@apache.org> Mon Jan 01 12:15:10 2024 +0100
committer GitHub <noreply@github.com> Mon Jan 01 12:15:10 2024 +0100
tree fcb16f9536f555da6d34c3afda07917384725c3d
parent 5676f2e65f74dc5d489ae2cf74846eef0198cfe3
parent a75418a2a25310235f4405542839ee9d236c795b

Merge pull request #302 from briansu2004/patch-2

Update struts.xml - Timer Interceptor is DEPRECATED

.asf.yaml

diff --git a/.asf.yaml b/.asf.yaml
index f2ca9ba..c0e6069 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -4,11 +4,12 @@
   # Send all issue emails (new, closed, comments) to issues@
   issues: issues@struts.apache.org
   # Send new/closed PR notifications to commits@
-  pullrequests_status: commits@struts.apache.org
+  pullrequests_status: notifications@struts.apache.org
   # Send individual PR comments/reviews to issues@
-  pullrequests_comment: issues@struts.apache.org
+  pullrequests_comment: notifications@struts.apache.org
   # Link opened PRs with JIRA
   jira_options: link label worklog
+
 github:
   del_branch_on_merge: true
   autolink_jira:

annotations/src/main/resources/log4j2.xml

diff --git a/annotations/src/main/resources/log4j2.xml b/annotations/src/main/resources/log4j2.xml
index 3b08ab1..f5bdb17 100644
--- a/annotations/src/main/resources/log4j2.xml
+++ b/annotations/src/main/resources/log4j2.xml
@@ -8,6 +8,7 @@
     <Loggers>
         <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="info"/>
+        <Logger name="org.apache.struts2.convention" level="debug"/>
         <Logger name="example" level="debug"/>
         <Root level="info">
             <AppenderRef ref="STDOUT"/>

annotations/src/main/webapp/WEB-INF/web.xml

diff --git a/annotations/src/main/webapp/WEB-INF/web.xml b/annotations/src/main/webapp/WEB-INF/web.xml
index 6b49ec1..035cc56 100644
--- a/annotations/src/main/webapp/WEB-INF/web.xml
+++ b/annotations/src/main/webapp/WEB-INF/web.xml
@@ -11,6 +11,15 @@
             <param-name>struts.devMode</param-name>
             <param-value>true</param-value>
         </init-param>
+        <!-- Log4j is using *Action suffix as well, so narrow scanning just to a given package -->
+        <init-param>
+            <param-name>struts.convention.action.packages</param-name>
+            <param-value>example.actions</param-value>
+        </init-param>
+        <init-param>
+            <param-name>struts.convention.package.locators.disable</param-name>
+            <param-value>true</param-value>
+        </init-param>
     </filter>
 
     <filter-mapping>

quarkus/pom.xml

diff --git a/quarkus/pom.xml b/quarkus/pom.xml
index aa84e78..c831513 100644
--- a/quarkus/pom.xml
+++ b/quarkus/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>3.2.2</version>
+                        <version>3.2.3</version>
                         <executions>
                             <execution>
                                 <goals>

rest-angular/pom.xml

diff --git a/rest-angular/pom.xml b/rest-angular/pom.xml
index db68a3b..becab04 100644
--- a/rest-angular/pom.xml
+++ b/rest-angular/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>6.1.1</version>
+            <version>6.1.2</version>
             <scope>test</scope>
         </dependency>