You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/03/09 11:43:25 UTC
[3/3] syncope git commit: Merge branch '1_2_X'
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/71b65cbe
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/71b65cbe
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/71b65cbe
Branch: refs/heads/master
Commit: 71b65cbe4ce7341b4c9e5fac4aefc3c3fd548911
Parents: 246457c 2465f13
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Mar 9 11:42:59 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Mar 9 11:42:59 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/71b65cbe/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c2ad42a,117f414..4bbb17f
--- a/pom.xml
+++ b/pom.xml
@@@ -1133,12 -1169,12 +1133,12 @@@ under the License
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.4.12</version>
+ <version>1.4.13</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>