Uses the latest BETA version and corrects some merge issue
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/56b22f01 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/56b22f01 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/56b22f01 Branch: refs/heads/master Commit: 56b22f01126f9b3237ed4d5032cc04228d1b5a48 Parents: 069632f Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Tue Aug 25 08:31:20 2015 +0200 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Tue Aug 25 08:31:20 2015 +0200 ---------------------------------------------------------------------- pom.xml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/56b22f01/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 42acf00..a8ad427 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <struts2.version>2.5-SNAPSHOT</struts2.version> + <struts2.version>2.5-BETA1</struts2.version> <log4j2.version>2.3</log4j2.version> </properties> @@ -49,6 +49,10 @@ <id>apache.snapshots</id> <name>ASF Maven 2 Snapshot</name> <url>https://repository.apache.org/content/groups/snapshots/</url> + <layout>default</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> </repository> </repositories> @@ -114,15 +118,4 @@ </build> - <repositories> - <repository> - <id>apache-snapshots</id> - <url>https://repository.apache.org/content/groups/snapshots/</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - </project>
