This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.eclipse.jetty.ee8-jetty-ee8-maven-plugin-12.0.16 in repository https://gitbox.apache.org/repos/asf/struts-examples.git
discard c17de03 Bump org.eclipse.jetty.ee8:jetty-ee8-maven-plugin from 12.0.8 to 12.0.16 add 0afbfec Bump log4j2.version from 2.24.1 to 2.24.2 add 03e0cd3 Merge pull request #395 from apache/dependabot/maven/log4j2.version-2.24.2 add 930b93a Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.2.5 to 3.5.2 add daff46e Merge pull request #398 from apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.5.2 add d461e64 Bump actions/cache from 4.1.2 to 4.2.0 add b8cccdb Merge pull request #400 from apache/dependabot/github_actions/actions/cache-4.2.0 add 04b3baa Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 add e12cb3c Merge pull request #402 from apache/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.2 add 99fdcc5 Migrates to Struts 7 add b2ed942 Merge pull request #405 from apache/feature/struts7 add 30033a6 Extends example with Sitemesh 3 to support multiple decorators add 6889ad2 Merge pull request #389 from apache/feature/multiple-decorators add b01bbd2 Bump org.eclipse.jetty.ee8:jetty-ee8-maven-plugin from 12.0.8 to 12.0.16 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 (c17de03) \ N -- N -- N refs/heads/dependabot/maven/org.eclipse.jetty.ee8-jetty-ee8-maven-plugin-12.0.16 (b01bbd2) 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: .github/workflows/maven.yml | 4 +- .../java/org/apache/struts_examples/ActionA.java | 2 +- .../java/org/apache/struts_examples/ActionB.java | 2 +- .../src/main/java/example/actions/HelloAction.java | 3 +- .../main/java/example/actions/RegisterAction.java | 2 +- annotations/src/main/resources/log4j2.xml | 1 - basic-struts/src/main/resources/log4j2.xml | 1 - .../org/apache/struts/edit/action/EditAction.java | 2 +- bean-validation/src/main/resources/log4j2.xml | 1 - blank/src/main/java/example/ExampleSupport.java | 2 +- blank/src/main/resources/log4j2.xml | 1 - blank/src/test/java/example/ConfigTest.java | 10 ++-- blank/src/test/java/example/HelloWorldTest.java | 2 +- blank/src/test/java/example/LoginTest.java | 4 +- .../struts/helloworld/action/HelloWorldAction.java | 22 ++++----- coding-actions/src/main/resources/log4j2.xml | 1 - .../org/apache/struts/edit/action/EditAction.java | 2 +- control-tags/src/main/resources/log4j2.xml | 1 - .../apache/struts/crud/action/PersonAction.java | 16 +++---- crud/src/main/resources/log4j2.xml | 1 - .../struts/helloworld/action/HelloWorldAction.java | 24 +++++----- .../apache/struts/register/action/Register.java | 7 ++- debugging-struts/src/main/resources/log4j2.xml | 1 - .../org/apache/struts_example/IndexAction.java | 4 +- dynamic-href/src/main/resources/log4j2.xml | 1 - .../struts/helloworld/action/HelloWorldAction.java | 34 +++++++------ .../apache/struts/register/action/Register.java | 8 ++-- exception-handling/src/main/resources/log4j2.xml | 1 - .../org/apache/struts/edit/action/EditAction.java | 22 ++++----- exclude-parameters/src/main/resources/log4j2.xml | 1 - expression-cache/pom.xml | 1 - .../java/org/apache/struts/cache/CustomOEC.java | 2 +- .../org/apache/struts/cache/CustomOECFactory.java | 30 ++++++------ .../java/org/apache/struts/cache/CustomOELRUC.java | 2 +- .../java/org/apache/struts/cache/IndexAction.java | 2 +- expression-cache/src/main/resources/struts.xml | 2 +- .../java/org/apache/struts/example/Upload.java | 2 +- file-upload/src/main/resources/log4j2.xml | 1 - .../struts/helloworld/action/HelloWorldAction.java | 24 +++++----- .../apache/struts/register/action/Register.java | 2 +- form-processing/src/main/resources/log4j2.xml | 1 - .../org/apache/struts/edit/action/EditAction.java | 2 +- form-tags/src/main/resources/log4j2.xml | 1 - .../struts/helloworld/action/HelloWorldAction.java | 34 +++++++------ .../apache/struts/register/action/Register.java | 52 ++++++++++---------- form-validation/src/main/resources/log4j2.xml | 1 - .../org/apache/struts/edit/action/EditAction.java | 2 +- form-xml-validation/src/main/resources/log4j2.xml | 1 - .../helloworld/action/ExecAndWaitTestAction.java | 2 +- .../struts/helloworld/action/HelloWorldAction.java | 11 ++--- helloworld/src/main/resources/log4j2.xml | 1 - .../struts/helloworld/action/HelloWorldAction.java | 6 +-- http-session/src/main/resources/log4j2.xml | 1 - .../apache/struts/register/action/Register.java | 53 ++++++++++---------- interceptors/src/main/resources/log4j2.xml | 1 - .../example/jasperreports/action/JasperAction.java | 2 +- jasperreports/src/main/resources/log4j2.xml | 1 - .../main/java/org/apache/struts/example/Chart.java | 2 +- jfreechart/src/main/resources/log4j2.xml | 1 - .../src/main/java/org/demo/ProduceAction.java | 2 +- json-customize/src/main/resources/log4j2.xml | 1 - json/src/main/java/org/demo/ConsumeAction.java | 2 +- json/src/main/java/org/demo/ProduceAction.java | 2 +- json/src/main/resources/log4j2.xml | 1 - .../mailreader2/AuthenticationInterceptor.java | 10 ++-- .../examples/mailreader2/MailreaderSupport.java | 2 +- .../examples/mailreader2/SubscriptionAction.java | 2 +- mailreader2/src/main/resources/log4j2.xml | 1 - mailreader2/src/main/webapp/tour.html | 6 +-- .../struts/helloworld/action/HelloWorldAction.java | 34 +++++++------ .../apache/struts/register/action/Register.java | 52 ++++++++++---------- message-resource/src/main/resources/log4j2.xml | 1 - .../org/apache/struts/example/HelloWorld1.java | 2 +- .../org/apache/struts/example/HelloWorld2.java | 2 +- message-store/src/main/resources/log4j2.xml | 2 - pom.xml | 6 +-- .../org/apache/struts/edit/action/EditAction.java | 4 +- preparable-interface/src/main/resources/log4j2.xml | 1 - quarkus/pom.xml | 2 +- .../struts2/examples/quarkus/IndexAction.java | 4 +- quarkus/src/main/resources/log4j2.xml | 1 - .../examples/struts/actions/IndexController.java | 2 +- .../struts/actions/data/LanguageController.java | 6 +-- .../struts/actions/data/OrderController.java | 2 +- .../interceptors/ExceptionHandlerInterceptor.java | 8 ++-- rest-angular/src/main/resources/log4j2.xml | 1 - .../struts/actions/IndexControllerTest.java | 2 +- .../struts/actions/data/OrderControllerTest.java | 2 +- .../org/apache/struts/example/MovieAction.java | 10 ++-- restful2actionmapper/src/main/resources/log4j2.xml | 1 - .../struts2/shiro/example/action/LoginAction.java | 56 +++++++++++----------- .../shiro/example/action/ShiroBaseAction.java | 12 ++--- .../example/interceptor/ShiroUserInterceptor.java | 28 +++-------- .../struts/examples/sitemesh3/HelloAction.java | 43 +++++++++++++++++ sitemesh3/src/main/resources/struts.xml | 14 +++--- .../main/webapp/WEB-INF/decorators/decorator.html | 3 +- .../decorators/{decorator.html => decorator1.html} | 3 +- .../decorators/{decorator.html => decorator2.html} | 3 +- sitemesh3/src/main/webapp/WEB-INF/error.jsp | 16 +++++++ sitemesh3/src/main/webapp/WEB-INF/hello.jsp | 27 ----------- sitemesh3/src/main/webapp/WEB-INF/hello1.jsp | 18 +++++++ sitemesh3/src/main/webapp/WEB-INF/hello2.jsp | 18 +++++++ sitemesh3/src/main/webapp/WEB-INF/index.jsp | 14 ++++++ sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml | 5 +- sitemesh3/src/main/webapp/index.html | 2 +- .../org/apache/struts/edit/action/EditAction.java | 56 +++++++++++----------- spring-struts/src/main/resources/log4j2.xml | 1 - .../org/apache/struts_example/FactoryAction.java | 2 +- .../org/apache/struts_example/IndexAction.java | 7 ++- .../struts_example/MyLocalizedTextProvider.java | 2 +- .../struts_example/MyTextProviderFactory.java | 8 ++-- .../apache/struts_example/MyTextTextProvider.java | 8 ++-- .../org/apache/struts_example/SystemAction.java | 6 +-- text-provider/src/main/resources/struts.xml | 6 +-- .../org/apache/struts/edit/action/EditAction.java | 52 ++++++++++---------- themes-override/src/main/resources/log4j2.xml | 1 - .../org/apache/struts/edit/action/EditAction.java | 53 ++++++++++---------- themes/src/main/resources/log4j2.xml | 1 - .../main/java/org/demo/example/ExampleSupport.java | 2 +- .../org/apache/struts/example/NumberAction.java | 2 +- .../org/apache/struts/example/ThemeAction.java | 2 +- type-conversion/src/main/resources/log4j2.xml | 2 - .../apache/struts/register/action/Register.java | 2 +- unit-testing/src/main/resources/log4j2.xml | 1 - .../struts/register/action/RegisterTest.java | 4 +- .../org/apache/strutsexamples/actions/Home.java | 2 +- .../org/apache/strutsexamples/actions/Index.java | 2 +- .../org/apache/strutsexamples/actions/Login.java | 2 +- .../apache/strutsexamples/actions/admin/Users.java | 2 +- .../strutsexamples/web/TilesUnknownHandler.java | 10 ++-- unknown-handler/src/main/resources/log4j2.xml | 2 - unknown-handler/src/main/resources/struts.xml | 2 +- .../helloworld/action/HelloWorldAction.java | 20 ++++---- using-tags/src/main/resources/log4j2.xml | 1 - .../struts/validation_messages/ExampleSupport.java | 2 +- .../apache/struts/validation_messages/Login.java | 2 - validation-messages/src/main/resources/log4j2.xml | 2 - .../wildcardmethod/action/PersonAction.java | 2 +- .../src/main/resources/log4j2.xml | 1 - .../main/java/org/apache/struts/form/Start.java | 2 +- .../main/java/org/apache/struts/store/Save.java | 2 +- wildcard-regex/src/main/resources/log4j2.xml | 2 - 142 files changed, 570 insertions(+), 568 deletions(-) create mode 100644 sitemesh3/src/main/java/org/apache/struts/examples/sitemesh3/HelloAction.java copy sitemesh3/src/main/webapp/WEB-INF/decorators/{decorator.html => decorator1.html} (84%) copy sitemesh3/src/main/webapp/WEB-INF/decorators/{decorator.html => decorator2.html} (84%) create mode 100644 sitemesh3/src/main/webapp/WEB-INF/error.jsp delete mode 100644 sitemesh3/src/main/webapp/WEB-INF/hello.jsp create mode 100644 sitemesh3/src/main/webapp/WEB-INF/hello1.jsp create mode 100644 sitemesh3/src/main/webapp/WEB-INF/hello2.jsp create mode 100644 sitemesh3/src/main/webapp/WEB-INF/index.jsp