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/08/27 17:52:50 UTC
[2/3] syncope git commit: Merge from 1_2_X
Merge from 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/0272b1ed
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0272b1ed
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0272b1ed
Branch: refs/heads/master
Commit: 0272b1ed49a1a902e242b65b3b7ed51e74d674dd
Parents: 926e8fd aa2286b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Aug 27 17:00:43 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Aug 27 17:00:43 2015 +0200
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0272b1ed/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 68e2997,07f0891..3b2a66f
--- a/pom.xml
+++ b/pom.xml
@@@ -1140,16 -1148,11 +1140,16 @@@ under the License
<artifactId>net.tirasa.connid.bundles.csvdir</artifactId>
<version>${connid.csvdir.version}</version>
</artifactItem>
- <dependency>
+ <artifactItem>
<groupId>net.tirasa.connid.bundles.db</groupId>
<artifactId>net.tirasa.connid.bundles.db.table</artifactId>
- <version>${connid.db.table.version}</version>
+ <version>${connid.database.version}</version>
- </dependency>
- <dependency>
++ </artifactItem>
++ <artifactItem>
+ <groupId>net.tirasa.connid.bundles.db</groupId>
+ <artifactId>net.tirasa.connid.bundles.db.scriptedsql</artifactId>
+ <version>${connid.database.version}</version>
- </dependency>
+ </artifactItem>
<artifactItem>
<groupId>net.tirasa.connid.bundles</groupId>
<artifactId>net.tirasa.connid.bundles.ldap</artifactId>