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:23 UTC

[1/3] syncope git commit: Upgrading cargo

Repository: syncope
Updated Branches:
  refs/heads/1_2_X 28783291d -> 2465f1317
  refs/heads/master 246457cd5 -> 71b65cbe4


Upgrading cargo


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2465f131
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2465f131
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2465f131

Branch: refs/heads/1_2_X
Commit: 2465f13170adae51b832060522bb19813581f2f4
Parents: 2878329
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Mar 9 11:42:53 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Mar 9 11:42:53 2015 +0100

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/2465f131/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b769f3a..117f414 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.12</version>
+          <version>1.4.13</version>
           <configuration>
             <container>
               <containerId>tomcat7x</containerId>


[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/2465f131
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2465f131
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2465f131

Branch: refs/heads/master
Commit: 2465f13170adae51b832060522bb19813581f2f4
Parents: 2878329
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Mar 9 11:42:53 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Mar 9 11:42:53 2015 +0100

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/2465f131/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b769f3a..117f414 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.12</version>
+          <version>1.4.13</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/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>