Author: ilgrosso
Date: Thu Oct 9 09:35:32 2014
New Revision: 1630355
URL: http://svn.apache.org/r1630355
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1630020-1630354
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1630355&r1=1630354&r2=1630355&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Oct 9 09:35:32 2014
@@ -357,7 +357,7 @@ under the License.
<httpclient.version>4.3.5</httpclient.version>
- <tomcat.version>8.0.14</tomcat.version>
+ <tomcat.version>7.0.56</tomcat.version>
<jasypt.version>1.9.2</jasypt.version>
@@ -1154,9 +1154,9 @@ under the License.
<version>1.4.10</version>
<configuration>
<container>
- <containerId>tomcat8x</containerId>
+ <containerId>tomcat7x</containerId>
<zipUrlInstaller>
-
<url>http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
+
<url>http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
