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/07/15 10:07:09 UTC
[1/3] syncope git commit: Upgrading cargo
Repository: syncope
Updated Branches:
refs/heads/1_2_X 81a66445f -> 4e77922c2
refs/heads/master 869ec86e1 -> e3360b6c5
Upgrading cargo
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4e77922c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4e77922c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4e77922c
Branch: refs/heads/1_2_X
Commit: 4e77922c2495ea835b3d80982fe659cb681bdd66
Parents: 81a6644
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Jul 15 10:06:22 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Jul 15 10:06:22 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4e77922c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d0a5e48..b919f82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1169,7 +1169,7 @@ 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>
[3/3] syncope git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
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ò <il...@apache.org>
Authored: Wed Jul 15 10:06:31 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
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>
[2/3] syncope git commit: Upgrading cargo
Posted by il...@apache.org.
Upgrading cargo
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4e77922c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4e77922c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4e77922c
Branch: refs/heads/master
Commit: 4e77922c2495ea835b3d80982fe659cb681bdd66
Parents: 81a6644
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Jul 15 10:06:22 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Jul 15 10:06:22 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4e77922c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d0a5e48..b919f82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1169,7 +1169,7 @@ 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>