Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e3360b6c Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e3360b6c Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e3360b6c Branch: refs/heads/master Commit: e3360b6c547e411e0d216c919560a9b231e3475c Parents: 869ec86 4e77922 Author: Francesco Chicchiriccò <[email protected]> Authored: Wed Jul 15 10:06:31 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed Jul 15 10:06:31 2015 +0200 ---------------------------------------------------------------------- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/e3360b6c/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 706b944,b919f82..88a233d --- a/pom.xml +++ b/pom.xml @@@ -1186,12 -1169,12 +1186,12 @@@ under the License <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> - <version>1.4.14</version> + <version>1.4.15</version> <configuration> <container> - <containerId>tomcat7x</containerId> + <containerId>tomcat8x</containerId> <zipUrlInstaller> - <url>http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url> + <url>http://archive.apache.org/dist/tomcat/tomcat-8/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>
