This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch new-mailreader in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit b3a31065ac1e621b94a5812d50f4ef49140e4875 Author: Lukasz Lenart <[email protected]> AuthorDate: Fri Dec 13 12:11:40 2019 +0100 Cleans up poms --- action-chaining/pom.xml | 3 +-- annotations/pom.xml | 4 +--- basic-struts/pom.xml | 3 ++- bean-validation/pom.xml | 4 ++-- blank/pom.xml | 2 +- coding-actions/pom.xml | 2 +- control-tags/pom.xml | 6 +++--- crud/pom.xml | 3 +-- debugging-struts/pom.xml | 6 +++--- exception-handling/pom.xml | 5 ++--- exclude-parameters/pom.xml | 3 ++- file-upload/pom.xml | 4 ++-- form-processing/pom.xml | 5 ++--- form-tags/pom.xml | 4 +--- form-validation/pom.xml | 4 +--- form-xml-validation/pom.xml | 5 ++--- helloworld/pom.xml | 7 +++---- http-session/pom.xml | 3 ++- interceptors/pom.xml | 4 +--- json-customize/pom.xml | 7 +++---- json/pom.xml | 7 +++---- mailreader2/pom.xml | 11 +++++++++-- mailreader2/src/main/resources/mailreader-default.xml | 10 +++++----- mailreader2/src/main/webapp/META-INF/context.xml | 3 --- mailreader2/src/main/webapp/WEB-INF/web.xml | 2 +- mailreader2/src/main/webapp/index.html | 2 +- message-resource/pom.xml | 4 +--- message-store/pom.xml | 6 +++--- pom.xml | 2 ++ portlet/pom.xml | 5 +++-- preparable-interface/pom.xml | 4 +--- rest-angular/pom.xml | 7 +++---- restful2actionmapper/pom.xml | 10 +++------- shiro-basic/pom.xml | 3 +-- spring-struts/pom.xml | 3 +-- text-provider/pom.xml | 5 +++-- themes-override/pom.xml | 4 +--- themes/pom.xml | 8 ++------ tiles/pom.xml | 5 +++-- type-conversion/pom.xml | 5 +++-- unit-testing/pom.xml | 3 +-- unknown-handler/pom.xml | 6 +++--- using-tags/pom.xml | 3 +-- validation-messages/pom.xml | 2 +- wildcard-method-selection/pom.xml | 6 ++---- wildcard-regex/pom.xml | 7 +++---- 46 files changed, 96 insertions(+), 121 deletions(-) diff --git a/action-chaining/pom.xml b/action-chaining/pom.xml index f75624d..4891543 100644 --- a/action-chaining/pom.xml +++ b/action-chaining/pom.xml @@ -5,11 +5,10 @@ <parent> <artifactId>struts-examples</artifactId> <groupId>org.apache.struts</groupId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>action-chaining</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>war</packaging> <name>Action chaining</name> diff --git a/annotations/pom.xml b/annotations/pom.xml index 14b3618..3b8a987 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -6,13 +6,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>annotations</artifactId> - <name>Annotations with Convention Plugin</name> - <description>Annotations example application for the Struts 2 getting started tutorials</description> <packaging>war</packaging> diff --git a/basic-struts/pom.xml b/basic-struts/pom.xml index 652fa07..ec76d2d 100644 --- a/basic-struts/pom.xml +++ b/basic-struts/pom.xml @@ -6,8 +6,9 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> + <artifactId>basic-struts</artifactId> <name>Basic Struts2 Example</name> <description>Basic Struts 2 example application</description> diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml index 8628187..70bef07 100755 --- a/bean-validation/pom.xml +++ b/bean-validation/pom.xml @@ -4,10 +4,10 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> - <artifactId>bean-validation</artifactId> + <artifactId>bean-validation</artifactId> <name>Bean Validation</name> <description>bean (JSR 303) validation example application for the Struts 2 getting started tutorials</description> diff --git a/blank/pom.xml b/blank/pom.xml index ebcbd0b..db02817 100644 --- a/blank/pom.xml +++ b/blank/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>blank</artifactId> diff --git a/coding-actions/pom.xml b/coding-actions/pom.xml index 428e2de..50efd0a 100644 --- a/coding-actions/pom.xml +++ b/coding-actions/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>coding-actions</artifactId> diff --git a/control-tags/pom.xml b/control-tags/pom.xml index fea5ddd..444a101 100755 --- a/control-tags/pom.xml +++ b/control-tags/pom.xml @@ -6,13 +6,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> - <artifactId>control-tags</artifactId> + <artifactId>control-tags</artifactId> <name>Control Tags</name> - <description>Control tags example application for the Struts 2 getting started tutorials</description> + <packaging>war</packaging> <build> diff --git a/crud/pom.xml b/crud/pom.xml index 74ded10..75f6bb4 100755 --- a/crud/pom.xml +++ b/crud/pom.xml @@ -7,11 +7,10 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>crud</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>war</packaging> <name>CRUD Example</name> diff --git a/debugging-struts/pom.xml b/debugging-struts/pom.xml index 9b1b3c0..e187331 100644 --- a/debugging-struts/pom.xml +++ b/debugging-struts/pom.xml @@ -5,15 +5,15 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>debugging-struts</artifactId> - <name>Debugging Struts</name> - <description>Exception handling example application for the Struts 2 getting started tutorials</description> + <packaging>war</packaging> + <dependencies> <dependency> <groupId>org.apache.struts</groupId> diff --git a/exception-handling/pom.xml b/exception-handling/pom.xml index db94e26..d2dd35a 100644 --- a/exception-handling/pom.xml +++ b/exception-handling/pom.xml @@ -6,14 +6,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>exception-handling</artifactId> - <name>Exception handling</name> - <description>Exception handling example application for the Struts 2 getting started tutorials</description> + <packaging>war</packaging> <build> diff --git a/exclude-parameters/pom.xml b/exclude-parameters/pom.xml index e956863..c28f0a0 100644 --- a/exclude-parameters/pom.xml +++ b/exclude-parameters/pom.xml @@ -6,12 +6,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>exclude-parameters</artifactId> <name>Exclude Parameters</name> <description>Struts 2 example application for the exclude parameters getting started tutorial</description> + <packaging>war</packaging> <build> diff --git a/file-upload/pom.xml b/file-upload/pom.xml index e2eff5b..52ec261 100644 --- a/file-upload/pom.xml +++ b/file-upload/pom.xml @@ -6,13 +6,13 @@ <parent> <artifactId>struts-examples</artifactId> <groupId>org.apache.struts</groupId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>file-upload</artifactId> - <name>File upload</name> <description>Simple file upload example</description> + <packaging>war</packaging> <properties> diff --git a/form-processing/pom.xml b/form-processing/pom.xml index 9a0e46a..544038e 100644 --- a/form-processing/pom.xml +++ b/form-processing/pom.xml @@ -6,12 +6,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> - <artifactId>form-processing</artifactId> + <artifactId>form-processing</artifactId> <name>Form Processing</name> - <description>Form processing example application for the Struts 2 getting started tutorials</description> <packaging>war</packaging> diff --git a/form-tags/pom.xml b/form-tags/pom.xml index 7c1c12e..3dae605 100644 --- a/form-tags/pom.xml +++ b/form-tags/pom.xml @@ -6,13 +6,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>form-tags</artifactId> - <name>Form Tags</name> - <description>Form tags example application for the Struts 2 getting started tutorials</description> <packaging>war</packaging> diff --git a/form-validation/pom.xml b/form-validation/pom.xml index 8bbdf85..e0f722f 100644 --- a/form-validation/pom.xml +++ b/form-validation/pom.xml @@ -6,13 +6,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>form-validation</artifactId> - <name>Form validation</name> - <description>Form validation example application for the Struts 2 getting started tutorials</description> <packaging>war</packaging> diff --git a/form-xml-validation/pom.xml b/form-xml-validation/pom.xml index 8fb82a6..e29a2e6 100644 --- a/form-xml-validation/pom.xml +++ b/form-xml-validation/pom.xml @@ -6,14 +6,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>form-xml-validation</artifactId> - <name>XML based form validation</name> - <description>Form XML validation example application for the Struts 2 getting started tutorials</description> + <packaging>war</packaging> <build> diff --git a/helloworld/pom.xml b/helloworld/pom.xml index def4eef..4c681d9 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -6,16 +6,15 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>helloworld</artifactId> - <packaging>war</packaging> - <name>Hello World Struts 2 Example Application</name> - <description>Hello world example application for the Struts 2 Getting Started tutorials</description> + <packaging>war</packaging> + <build> <finalName>hello-world</finalName> <plugins> diff --git a/http-session/pom.xml b/http-session/pom.xml index 1409ab3..5b3936f 100644 --- a/http-session/pom.xml +++ b/http-session/pom.xml @@ -6,12 +6,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>http-session</artifactId> <name>Http Session</name> <description>Struts 2 example application for the HTTP Session getting started tutorial</description> + <packaging>war</packaging> <build> diff --git a/interceptors/pom.xml b/interceptors/pom.xml index 2cf5f9e..a3e46d0 100644 --- a/interceptors/pom.xml +++ b/interceptors/pom.xml @@ -6,13 +6,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>interceptors</artifactId> - <name>Struts 2 Interceptors</name> - <description>Form XML validation example application for the Struts 2 getting started tutorials</description> <packaging>war</packaging> diff --git a/json-customize/pom.xml b/json-customize/pom.xml index 9a441ff..e03f635 100644 --- a/json-customize/pom.xml +++ b/json-customize/pom.xml @@ -5,15 +5,14 @@ <parent> <artifactId>struts-examples</artifactId> <groupId>org.apache.struts</groupId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> - <groupId>org.demo</groupId> <artifactId>json-customize</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>war</packaging> <name>Customized JSON produce</name> + <packaging>war</packaging> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/json/pom.xml b/json/pom.xml index 4e5b827..b39117f 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -5,15 +5,14 @@ <parent> <artifactId>struts-examples</artifactId> <groupId>org.apache.struts</groupId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> - <groupId>org.demo</groupId> <artifactId>json</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>war</packaging> <name>JSON produce/consume</name> + <packaging>war</packaging> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/mailreader2/pom.xml b/mailreader2/pom.xml index 8e2da35..4c22e74 100644 --- a/mailreader2/pom.xml +++ b/mailreader2/pom.xml @@ -25,16 +25,23 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>mailreader2</artifactId> - <packaging>war</packaging> <name>Struts 2 Mail Reader Webapp</name> + <packaging>war</packaging> + <dependencies> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <version>${struts2.version}</version> + </dependency> + + <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> <version>2.1</version> diff --git a/mailreader2/src/main/resources/mailreader-default.xml b/mailreader2/src/main/resources/mailreader-default.xml index ccc1ced..3bfee57 100644 --- a/mailreader2/src/main/resources/mailreader-default.xml +++ b/mailreader2/src/main/resources/mailreader-default.xml @@ -12,17 +12,17 @@ <interceptor name="authentication" class="org.apache.struts.examples.mailreader2.AuthenticationInterceptor"/> - <interceptor-stack name="user" > - <interceptor-ref name="authentication" /> + <interceptor-stack name="user"> + <interceptor-ref name="authentication"/> <interceptor-ref name="defaultStack"/> </interceptor-stack> - <interceptor-stack name="user-submit" > - <interceptor-ref name="tokenSession" /> + <interceptor-stack name="user-submit"> + <interceptor-ref name="tokenSession"/> <interceptor-ref name="user"/> </interceptor-stack> - <interceptor-stack name="guest" > + <interceptor-stack name="guest"> <interceptor-ref name="defaultStack"/> </interceptor-stack> diff --git a/mailreader2/src/main/webapp/META-INF/context.xml b/mailreader2/src/main/webapp/META-INF/context.xml deleted file mode 100644 index 9b0b5d0..0000000 --- a/mailreader2/src/main/webapp/META-INF/context.xml +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Context path="/"> -</Context> diff --git a/mailreader2/src/main/webapp/WEB-INF/web.xml b/mailreader2/src/main/webapp/WEB-INF/web.xml index 6437955..7000fbe 100644 --- a/mailreader2/src/main/webapp/WEB-INF/web.xml +++ b/mailreader2/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";> <web-app> - <display-name>Struts 2 Mailreader</display-name> + <display-name>Struts 2 Mailreader 2</display-name> <filter> <filter-name>struts2</filter-name> diff --git a/mailreader2/src/main/webapp/index.html b/mailreader2/src/main/webapp/index.html index 1b01b3f..6538065 100644 --- a/mailreader2/src/main/webapp/index.html +++ b/mailreader2/src/main/webapp/index.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome.do"> + <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome"> </head> <body> diff --git a/message-resource/pom.xml b/message-resource/pom.xml index d60d308..3c2fdf9 100644 --- a/message-resource/pom.xml +++ b/message-resource/pom.xml @@ -6,13 +6,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>message-resource</artifactId> - <name>Message resource</name> - <description>Message resource example application for the Struts 2 getting started tutorials</description> <packaging>war</packaging> diff --git a/message-store/pom.xml b/message-store/pom.xml index 26865fb..a08f80b 100644 --- a/message-store/pom.xml +++ b/message-store/pom.xml @@ -5,14 +5,14 @@ <parent> <artifactId>struts-examples</artifactId> <groupId>org.apache.struts</groupId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>message-store</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>war</packaging> <name>Message Store</name> + <packaging>war</packaging> + <dependencies> <dependency> <groupId>javax.servlet</groupId> diff --git a/pom.xml b/pom.xml index 73995dc..acf82b5 100644 --- a/pom.xml +++ b/pom.xml @@ -2,10 +2,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> <version>1.1.0</version> <packaging>pom</packaging> + <name>Struts 2 Examples</name> <description> This is the parent pom for the Struts 2 examples that diff --git a/portlet/pom.xml b/portlet/pom.xml index 16df2b5..0956a12 100644 --- a/portlet/pom.xml +++ b/portlet/pom.xml @@ -24,13 +24,14 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>portlet</artifactId> - <packaging>war</packaging> <name>Portlet Webapp</name> + <packaging>war</packaging> + <profiles> <profile> <id>pluto</id> diff --git a/preparable-interface/pom.xml b/preparable-interface/pom.xml index fef9a70..1ed49e6 100644 --- a/preparable-interface/pom.xml +++ b/preparable-interface/pom.xml @@ -6,13 +6,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>preparable-interface</artifactId> - <name>Preparable Interface</name> - <description>Struts 2 example application for the preparable interface getting started tutorial</description> <packaging>war</packaging> diff --git a/rest-angular/pom.xml b/rest-angular/pom.xml index 6146ad5..8b7bf6a 100644 --- a/rest-angular/pom.xml +++ b/rest-angular/pom.xml @@ -5,16 +5,15 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>rest-angular</artifactId> - <packaging>war</packaging> - <name>REST Plugin based application with AngularJS</name> - <description>A REST Plugin based Struts2 application with AngularJS frontend, Bean validation, Exception Handling and multi language support.</description> + <packaging>war</packaging> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <jackson.version>2.10.1</jackson.version> diff --git a/restful2actionmapper/pom.xml b/restful2actionmapper/pom.xml index 707a79a..371f530 100644 --- a/restful2actionmapper/pom.xml +++ b/restful2actionmapper/pom.xml @@ -6,18 +6,14 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>restful2actionmapper</artifactId> - - <packaging>war</packaging> - <name>REST to Action Mapper Example Application</name> + <description>Example of using Rest style URLs for Struts 2 Getting Started tutorials</description> - <description>Example of using Rest style URLs for - Struts 2 Getting Started tutorials - </description> + <packaging>war</packaging> <build> <finalName>reststyleactionmapper</finalName> diff --git a/shiro-basic/pom.xml b/shiro-basic/pom.xml index 35e8fc2..97c7c6e 100644 --- a/shiro-basic/pom.xml +++ b/shiro-basic/pom.xml @@ -4,11 +4,10 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>shiro-basic</artifactId> - <name>Struts2 with Basic Shiro Security Integration</name> <packaging>war</packaging> diff --git a/spring-struts/pom.xml b/spring-struts/pom.xml index 8431070..a6ddd54 100644 --- a/spring-struts/pom.xml +++ b/spring-struts/pom.xml @@ -6,11 +6,10 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>spring-struts</artifactId> - <name>Struts2 with Spring Integration</name> <packaging>war</packaging> diff --git a/text-provider/pom.xml b/text-provider/pom.xml index c1b302a..c7d3a40 100644 --- a/text-provider/pom.xml +++ b/text-provider/pom.xml @@ -5,13 +5,14 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>text-provider</artifactId> - <packaging>war</packaging> <name>Custom TextProvider</name> + <packaging>war</packaging> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/themes-override/pom.xml b/themes-override/pom.xml index 89cac9a..3a395f3 100644 --- a/themes-override/pom.xml +++ b/themes-override/pom.xml @@ -6,13 +6,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>themes-override</artifactId> - <name>Struts 2 Themes Override</name> - <description>Struts 2 themes override example application for the Struts 2 getting started tutorials</description> <packaging>war</packaging> diff --git a/themes/pom.xml b/themes/pom.xml index 8061c04..cf9648a 100644 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -6,16 +6,12 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>themes</artifactId> - <name>Struts 2 Themes</name> - - <description>Struts 2 themes example application for the - Struts 2 getting started tutorials - </description> + <description>Struts 2 themes example application for the Struts 2 getting started tutorials</description> <packaging>war</packaging> diff --git a/tiles/pom.xml b/tiles/pom.xml index 82cd6b0..598408d 100644 --- a/tiles/pom.xml +++ b/tiles/pom.xml @@ -5,13 +5,14 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>tiles</artifactId> - <packaging>war</packaging> <name>Struts Tiles Example</name> + <packaging>war</packaging> + <dependencies> <dependency> <groupId>org.apache.struts</groupId> diff --git a/type-conversion/pom.xml b/type-conversion/pom.xml index 32eb052..d320d7c 100644 --- a/type-conversion/pom.xml +++ b/type-conversion/pom.xml @@ -6,13 +6,14 @@ <parent> <artifactId>struts-examples</artifactId> <groupId>org.apache.struts</groupId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>type-conversion</artifactId> - <packaging>war</packaging> <name>Type Conversion</name> + <packaging>war</packaging> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/unit-testing/pom.xml b/unit-testing/pom.xml index 0dfb546..a8f4c4a 100644 --- a/unit-testing/pom.xml +++ b/unit-testing/pom.xml @@ -6,11 +6,10 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>unit-testing</artifactId> - <name>Unit Testing</name> <packaging>war</packaging> diff --git a/unknown-handler/pom.xml b/unknown-handler/pom.xml index 9f5a520..32dfaae 100644 --- a/unknown-handler/pom.xml +++ b/unknown-handler/pom.xml @@ -6,14 +6,14 @@ <parent> <artifactId>struts-examples</artifactId> <groupId>org.apache.struts</groupId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> - <groupId>org.apache.org</groupId> <artifactId>unknown-handler</artifactId> - <packaging>war</packaging> <name>Unknown handler</name> + <packaging>war</packaging> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/using-tags/pom.xml b/using-tags/pom.xml index ae084fd..427be91 100644 --- a/using-tags/pom.xml +++ b/using-tags/pom.xml @@ -6,12 +6,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>using-tags</artifactId> <name>Using Struts 2 Tags</name> - <description>Struts 2 example application for the Using Struts 2 Tags getting started tutorial</description> <packaging>war</packaging> diff --git a/validation-messages/pom.xml b/validation-messages/pom.xml index 131dbb7..0af2449 100644 --- a/validation-messages/pom.xml +++ b/validation-messages/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>struts-examples</artifactId> <groupId>org.apache.struts</groupId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>validation-messages</artifactId> diff --git a/wildcard-method-selection/pom.xml b/wildcard-method-selection/pom.xml index 46a9b5c..29b9a6f 100644 --- a/wildcard-method-selection/pom.xml +++ b/wildcard-method-selection/pom.xml @@ -6,15 +6,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> <artifactId>wildcard-method-selection</artifactId> - <name>Wildcard Method Selection</name> + <description>Wildcard method selection example application for the Struts 2 getting started tutorials</description> - <description>Wildcard method selection example application for the Struts 2 getting started tutorials - </description> <packaging>war</packaging> <build> diff --git a/wildcard-regex/pom.xml b/wildcard-regex/pom.xml index e5521a8..7c0dba5 100644 --- a/wildcard-regex/pom.xml +++ b/wildcard-regex/pom.xml @@ -5,15 +5,14 @@ <parent> <artifactId>struts-examples</artifactId> <groupId>org.apache.struts</groupId> - <version>1.0.0</version> + <version>1.1.0</version> </parent> - <groupId>org.apache.struts</groupId> <artifactId>wildcard-regex</artifactId> - <packaging>war</packaging> - <version>1</version> <name>Wildcard RegEx pattern matching</name> + <packaging>war</packaging> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties>
