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/11 11:25:01 UTC
[6/8] syncope git commit: Upgrading ConnId AD bundle
Upgrading ConnId AD bundle
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b836d8c6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b836d8c6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b836d8c6
Branch: refs/heads/master
Commit: b836d8c65a2550a31d4f16c53b37ef194219fe18
Parents: 986362f 5641a5c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Nov 11 10:57:28 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Nov 11 10:57:28 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b836d8c6/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 945a79b,a43b318..71dfbb9
--- a/pom.xml
+++ b/pom.xml
@@@ -298,24 -298,20 +298,24 @@@ under the License
<prerequisites>
<maven>[3.0.3,)</maven>
</prerequisites>
-
- <properties>
+
+ <properties>
+ <syncope.version>${project.version}</syncope.version>
<targetJdk>1.6</targetJdk>
-
- <servlet-api.version>2.5</servlet-api.version>
+
+ <servlet-api.version>3.0.1</servlet-api.version>
<jsp-api.version>2.2</jsp-api.version>
<jstl.version>1.2</jstl.version>
-
- <connid.version>1.3.3</connid.version>
- <connid.soap.version>1.2.7</connid.soap.version>
- <connid.db.table.version>2.1.6</connid.db.table.version>
- <connid.csvdir.version>0.7</connid.csvdir.version>
- <connid.ldap.version>1.3.6</connid.ldap.version>
- <connid.ad.version>1.1.4</connid.ad.version>
+ <!-- Upgrade to 3.0.0 for Java 7+ -->
+ <javax.el.version>3.0-b02</javax.el.version>
+ <jax-rs.version>2.0</jax-rs.version>
+
+ <connid.version>1.4.0.0</connid.version>
+ <connid.soap.version>1.3.0</connid.soap.version>
+ <connid.db.table.version>2.2.0</connid.db.table.version>
+ <connid.csvdir.version>0.8</connid.csvdir.version>
+ <connid.ldap.version>1.4.0</connid.ldap.version>
- <connid.ad.version>1.2.0</connid.ad.version>
++ <connid.ad.version>1.2.1</connid.ad.version>
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>3.3.2</commons-lang.version>