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/02/12 09:03:29 UTC
[4/8] syncope git commit: [SYNCOPE-635] merged from 1_1_X - still
missing 2.0.0
[SYNCOPE-635] merged from 1_1_X - still missing 2.0.0
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b8889467
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b8889467
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b8889467
Branch: refs/heads/2_0_X
Commit: b888946739775224f5e7b91530274a843df035fe
Parents: 1ef6896 6f0fbc1
Author: fmartelli <fa...@gmail.com>
Authored: Wed Feb 11 17:56:33 2015 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Wed Feb 11 17:56:33 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b8889467/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 98c7e81,b02c2f3..9cba9ff
--- a/pom.xml
+++ b/pom.xml
@@@ -310,24 -298,20 +310,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.1</connid.csvdir.version>
- <connid.ldap.version>1.3.6</connid.ldap.version>
- <connid.ad.version>1.1.6</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.1</connid.db.table.version>
- <connid.csvdir.version>0.8.1</connid.csvdir.version>
++ <connid.csvdir.version>0.8.2</connid.csvdir.version>
+ <connid.ldap.version>1.4.0</connid.ldap.version>
+ <connid.ad.version>1.2.2</connid.ad.version>
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>3.3.2</commons-lang.version>