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 2014/11/03 16:47:09 UTC
[4/4] 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/e63047fd
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e63047fd
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e63047fd
Branch: refs/heads/master
Commit: e63047fda1b0976a1b7474b0ac95613869daed70
Parents: 61373f7 98992e1
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Nov 3 16:46:41 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Nov 3 16:46:41 2014 +0100
----------------------------------------------------------------------
archetype/pom.xml | 8 +--
build-tools/pom.xml | 10 ++--
client/pom.xml | 8 +--
common/pom.xml | 42 +++++++--------
console/pom.xml | 34 ++++++------
core-upgrader/pom.xml | 4 +-
core/pom.xml | 88 +++++++++++++++----------------
deb/pom.xml | 6 +--
installer/pom.xml | 30 +++++------
pom.xml | 125 ++++++++++++++++++++++-----------------------
standalone/pom.xml | 26 +++++-----
11 files changed, 190 insertions(+), 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/archetype/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/build-tools/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/client/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/common/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/console/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/core-upgrader/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/deb/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/installer/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index f92a2b8,122c3e2..677a7b5
--- a/pom.xml
+++ b/pom.xml
@@@ -23,10 -23,10 +23,10 @@@ under the License
<name>Apache Syncope</name>
<description>Apache Syncope parent POM</description>
-
+
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
http://git-wip-us.apache.org/repos/asf/syncope/blob/e63047fd/standalone/pom.xml
----------------------------------------------------------------------