You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2022/06/09 12:59:33 UTC
[struts-examples] branch master updated (aa7143b -> 3cae191)
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-examples.git
from aa7143b Merge pull request #142 from apache/dependabot/maven/quarkus-plugin.version-2.9.2.Final
new fb52f7e Uses latest Tiles DOCTYPE
new 3b200a1 Upgrades to Servlet API 3.1
new c6e9a62 Cleans up pom and uses missing Log4j to Slf4j bridge
new 5dd3b8b Adjusts logging pattern
new 3cae191 Upgrades Struts to version 6.0.0
The 5 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 | 4 ++--
tiles/pom.xml | 22 ++++++++++++++--------
tiles/src/main/resources/log4j2.xml | 6 +++---
tiles/src/main/webapp/WEB-INF/tiles-2.xml | 6 +++---
tiles/src/main/webapp/WEB-INF/tiles-2_pl.xml | 6 +++---
tiles/src/main/webapp/WEB-INF/tiles-ftl-layout.xml | 4 ++--
.../main/webapp/WEB-INF/tiles-ftl-layout_pl.xml | 4 ++--
tiles/src/main/webapp/WEB-INF/tiles_pl.xml | 6 +++---
tiles/src/main/webapp/WEB-INF/web.xml | 7 ++++---
9 files changed, 36 insertions(+), 29 deletions(-)
[struts-examples] 01/05: Uses latest Tiles DOCTYPE
Posted by lu...@apache.org.
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-examples.git
commit fb52f7e10e0b7699757b996c58e525fedfad1778
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Thu Jun 9 14:57:53 2022 +0200
Uses latest Tiles DOCTYPE
---
tiles/src/main/webapp/WEB-INF/tiles-2.xml | 6 +++---
tiles/src/main/webapp/WEB-INF/tiles-2_pl.xml | 6 +++---
tiles/src/main/webapp/WEB-INF/tiles-ftl-layout.xml | 4 ++--
tiles/src/main/webapp/WEB-INF/tiles-ftl-layout_pl.xml | 4 ++--
tiles/src/main/webapp/WEB-INF/tiles_pl.xml | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/tiles/src/main/webapp/WEB-INF/tiles-2.xml b/tiles/src/main/webapp/WEB-INF/tiles-2.xml
index bd3e2c6..b6657f2 100644
--- a/tiles/src/main/webapp/WEB-INF/tiles-2.xml
+++ b/tiles/src/main/webapp/WEB-INF/tiles-2.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions>
@@ -16,4 +16,4 @@
<put-attribute name="body" value="/example/HelloWorld.ftl"/>
</definition>
-</tiles-definitions>
\ No newline at end of file
+</tiles-definitions>
diff --git a/tiles/src/main/webapp/WEB-INF/tiles-2_pl.xml b/tiles/src/main/webapp/WEB-INF/tiles-2_pl.xml
index ea19f49..46f58c1 100644
--- a/tiles/src/main/webapp/WEB-INF/tiles-2_pl.xml
+++ b/tiles/src/main/webapp/WEB-INF/tiles-2_pl.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions>
@@ -16,4 +16,4 @@
<put-attribute name="body" value="/example/HelloWorld.ftl"/>
</definition>
-</tiles-definitions>
\ No newline at end of file
+</tiles-definitions>
diff --git a/tiles/src/main/webapp/WEB-INF/tiles-ftl-layout.xml b/tiles/src/main/webapp/WEB-INF/tiles-ftl-layout.xml
index 180def2..a9b30e5 100644
--- a/tiles/src/main/webapp/WEB-INF/tiles-ftl-layout.xml
+++ b/tiles/src/main/webapp/WEB-INF/tiles-ftl-layout.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions>
diff --git a/tiles/src/main/webapp/WEB-INF/tiles-ftl-layout_pl.xml b/tiles/src/main/webapp/WEB-INF/tiles-ftl-layout_pl.xml
index cd81f81..28e3211 100644
--- a/tiles/src/main/webapp/WEB-INF/tiles-ftl-layout_pl.xml
+++ b/tiles/src/main/webapp/WEB-INF/tiles-ftl-layout_pl.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions>
diff --git a/tiles/src/main/webapp/WEB-INF/tiles_pl.xml b/tiles/src/main/webapp/WEB-INF/tiles_pl.xml
index a351d55..2f5bf56 100644
--- a/tiles/src/main/webapp/WEB-INF/tiles_pl.xml
+++ b/tiles/src/main/webapp/WEB-INF/tiles_pl.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions>
@@ -19,4 +19,4 @@
<put-attribute name="body" value="/example/HelloWorld.jsp"/>
</definition>
-</tiles-definitions>
\ No newline at end of file
+</tiles-definitions>
[struts-examples] 03/05: Cleans up pom and uses missing Log4j to Slf4j bridge
Posted by lu...@apache.org.
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-examples.git
commit c6e9a627cfcea68875064c354f5400168cac3576
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Thu Jun 9 14:58:51 2022 +0200
Cleans up pom and uses missing Log4j to Slf4j bridge
---
tiles/pom.xml | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/tiles/pom.xml b/tiles/pom.xml
index a3dd4e0..e6e87d6 100644
--- a/tiles/pom.xml
+++ b/tiles/pom.xml
@@ -26,6 +26,12 @@
<version>${struts2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
@@ -42,22 +48,22 @@
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ <version>3.0.1-b12</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ <version>3.1.1</version>
<scope>provided</scope>
</dependency>
[struts-examples] 02/05: Upgrades to Servlet API 3.1
Posted by lu...@apache.org.
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-examples.git
commit 3b200a1757949c57e3a743c4fdd7ee28b6b6be0c
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Thu Jun 9 14:58:09 2022 +0200
Upgrades to Servlet API 3.1
---
tiles/src/main/webapp/WEB-INF/web.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tiles/src/main/webapp/WEB-INF/web.xml b/tiles/src/main/webapp/WEB-INF/web.xml
index 485a9cb..401c434 100644
--- a/tiles/src/main/webapp/WEB-INF/web.xml
+++ b/tiles/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="struts_blank" version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<display-name>Struts Tiles 2 Demo</display-name>
[struts-examples] 04/05: Adjusts logging pattern
Posted by lu...@apache.org.
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-examples.git
commit 5dd3b8bb2d47b4e18295f07de72a9a09d5da2f27
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Thu Jun 9 14:59:10 2022 +0200
Adjusts logging pattern
---
tiles/src/main/resources/log4j2.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tiles/src/main/resources/log4j2.xml b/tiles/src/main/resources/log4j2.xml
index d5f3566..1f4e3df 100644
--- a/tiles/src/main/resources/log4j2.xml
+++ b/tiles/src/main/resources/log4j2.xml
@@ -2,13 +2,13 @@
<Configuration>
<Appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+ <PatternLayout pattern="[%-5p] %C{2} (%F:%L) - %m%n"/>
</Console>
</Appenders>
<Loggers>
- <Logger name="org.apache.struts2.tiles" level="trace"/>
<Root level="info">
<AppenderRef ref="STDOUT"/>
</Root>
+ <Logger name="org.apache.struts2.tiles" level="trace"/>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
[struts-examples] 05/05: Upgrades Struts to version 6.0.0
Posted by lu...@apache.org.
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-examples.git
commit 3cae1910d45828596655aa71e4cbb2cacb787cf4
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Thu Jun 9 14:59:21 2022 +0200
Upgrades Struts to version 6.0.0
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 365043a..62219b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,9 +41,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <struts2.version>6.0.0-RC3</struts2.version>
+ <struts2.version>6.0.0</struts2.version>
<log4j2.version>2.17.2</log4j2.version>
- <jetty-plugin.version>9.4.35.v20201120</jetty-plugin.version>
+ <jetty-plugin.version>9.4.46.v20220331</jetty-plugin.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>