Merge branch 'master' into develop

This commit is contained in:
Lukasz Lenart
2014-03-06 21:42:26 +01:00
111 changed files with 18207 additions and 18418 deletions
+1 -7
View File
@@ -26,19 +26,13 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>2.3.17-SNAPSHOT</version>
<version>2.3.16.1</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
<packaging>jar</packaging>
<name>Struts 2 Codebehind Plugin</name>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/codebehind/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/codebehind/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/codebehind/</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>