This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/github_actions/actions/checkout-4.2.2
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
omit a39572c Bump actions/checkout from 4.1.7 to 4.2.2
add 93a874c Adds simple example with Sitemesh3 integration
add f6dcf44 Merge pull request #377 from apache/feature/sitemesh3
add 6edf340 Bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to 6.1.0
add 0395921 Merge pull request #379 from
apache/dependabot/maven/jakarta.servlet-jakarta.servlet-api-6.1.0
add d997bed Bump shiro.version from 2.0.0 to 2.0.1
add 288abeb Merge pull request #380 from
apache/dependabot/maven/shiro.version-2.0.1
add 282c3a8 Bump log4j2.version from 2.23.1 to 2.24.1
add 9c0e00d Merge pull request #382 from
apache/dependabot/maven/log4j2.version-2.24.1
add f17c050 Bump actions/cache from 4.0.2 to 4.1.2
add 7599eb8 Merge pull request #386 from
apache/dependabot/github_actions/actions/cache-4.1.2
add 37b8777 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3
to 3.11.1
add 4514323 Merge pull request #387 from
apache/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.1
add 08b3f3d Bump actions/checkout from 4.1.7 to 4.2.2
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 (a39572c)
\
N -- N -- N
refs/heads/dependabot/github_actions/actions/checkout-4.2.2 (08b3f3d)
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 | 2 +-
pom.xml | 7 ++--
shiro-basic/pom.xml | 2 +-
sitemesh3/README.md | 6 +++
{tiles => sitemesh3}/pom.xml | 10 ++---
.../src/main/resources/DefaultMessages.properties | 0
.../main/resources/DefaultMessages_es.properties | 0
{tiles => sitemesh3}/src/main/resources/log4j2.xml | 0
sitemesh3/src/main/resources/struts.xml | 22 +++++++++++
.../main/webapp/WEB-INF/decorators/decorator.html | 9 +++++
.../src/main/webapp/WEB-INF/hello.jsp | 17 ++++++---
sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml | 3 ++
sitemesh3/src/main/webapp/WEB-INF/web.xml | 44 ++++++++++++++++++++++
{blank => sitemesh3}/src/main/webapp/index.html | 0
14 files changed, 106 insertions(+), 16 deletions(-)
create mode 100644 sitemesh3/README.md
copy {tiles => sitemesh3}/pom.xml (89%)
copy tiles/src/main/resources/org/demo/example/package.properties =>
sitemesh3/src/main/resources/DefaultMessages.properties (100%)
copy tiles/src/main/resources/org/demo/example/package_es.properties =>
sitemesh3/src/main/resources/DefaultMessages_es.properties (100%)
copy {tiles => sitemesh3}/src/main/resources/log4j2.xml (100%)
create mode 100644 sitemesh3/src/main/resources/struts.xml
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
copy tiles/src/main/webapp/example/HelloWorld.jsp =>
sitemesh3/src/main/webapp/WEB-INF/hello.jsp (61%)
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/web.xml
copy {blank => sitemesh3}/src/main/webapp/index.html (100%)
