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:26 UTC
[1/8] syncope git commit: [SYNCOPE-635] fixes
Repository: syncope
Updated Branches:
refs/heads/2_0_X a5b5a174d -> cb1db75c1
refs/heads/master e777d5bab -> bc4fe9784
[SYNCOPE-635] fixes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6f0fbc17
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6f0fbc17
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6f0fbc17
Branch: refs/heads/2_0_X
Commit: 6f0fbc17946f82f2bbd8b3665495f56d08e6ce06
Parents: 2c4b4b8
Author: fmartelli <fa...@gmail.com>
Authored: Wed Feb 11 17:47:30 2015 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Wed Feb 11 17:47:30 2015 +0100
----------------------------------------------------------------------
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/6f0fbc17/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d189ac5..b02c2f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,7 +309,7 @@ under the License.
<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.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>
@@ -1337,6 +1337,7 @@ under the License.
<exclude>.externalToolBuilders/**</exclude>
<exclude>.git/**</exclude>
<exclude>.idea/**</exclude>
+ <exclude>**/target/**/*.*</exclude>
<exclude>**/.*</exclude>
</excludes>
</configuration>
[6/8] 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/bc4fe978
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bc4fe978
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bc4fe978
Branch: refs/heads/2_0_X
Commit: bc4fe9784d111ed97cec873d8367e35f836476ec
Parents: e777d5b b888946
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Feb 12 09:01:34 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Feb 12 09:01:34 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/bc4fe978/pom.xml
----------------------------------------------------------------------
[3/8] syncope git commit: [SYNCOPE-635] merged from 1_1_X - still
missing 2.0.0
Posted by il...@apache.org.
[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/master
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>
[4/8] syncope git commit: [SYNCOPE-635] merged from 1_1_X - still
missing 2.0.0
Posted by il...@apache.org.
[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>
[2/8] syncope git commit: [SYNCOPE-635] fixes
Posted by il...@apache.org.
[SYNCOPE-635] fixes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6f0fbc17
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6f0fbc17
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6f0fbc17
Branch: refs/heads/master
Commit: 6f0fbc17946f82f2bbd8b3665495f56d08e6ce06
Parents: 2c4b4b8
Author: fmartelli <fa...@gmail.com>
Authored: Wed Feb 11 17:47:30 2015 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Wed Feb 11 17:47:30 2015 +0100
----------------------------------------------------------------------
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/6f0fbc17/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d189ac5..b02c2f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,7 +309,7 @@ under the License.
<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.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>
@@ -1337,6 +1337,7 @@ under the License.
<exclude>.externalToolBuilders/**</exclude>
<exclude>.git/**</exclude>
<exclude>.idea/**</exclude>
+ <exclude>**/target/**/*.*</exclude>
<exclude>**/.*</exclude>
</excludes>
</configuration>
[7/8] syncope git commit: Merge branch 'master' into 2_0_X
Posted by il...@apache.org.
Merge branch 'master' into 2_0_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0af5aef5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0af5aef5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0af5aef5
Branch: refs/heads/2_0_X
Commit: 0af5aef531a0ca82c3aa1bbe2b0ce56234f9385d
Parents: a5b5a17 bc4fe97
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Feb 12 09:02:15 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Feb 12 09:02:15 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0af5aef5/pom.xml
----------------------------------------------------------------------
[8/8] syncope git commit: [SYNCOPE-635] Merge from master
Posted by il...@apache.org.
[SYNCOPE-635] Merge from master
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cb1db75c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cb1db75c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cb1db75c
Branch: refs/heads/2_0_X
Commit: cb1db75c1266d35fda9b19292d2b577c5a5d28de
Parents: 0af5aef
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Feb 12 09:03:14 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Feb 12 09:03:14 2015 +0100
----------------------------------------------------------------------
syncope620/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/cb1db75c/syncope620/pom.xml
----------------------------------------------------------------------
diff --git a/syncope620/pom.xml b/syncope620/pom.xml
index 93c43dd..06e6f81 100644
--- a/syncope620/pom.xml
+++ b/syncope620/pom.xml
@@ -316,7 +316,7 @@ under the License.
<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>
[5/8] 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/bc4fe978
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bc4fe978
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bc4fe978
Branch: refs/heads/master
Commit: bc4fe9784d111ed97cec873d8367e35f836476ec
Parents: e777d5b b888946
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Feb 12 09:01:34 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Feb 12 09:01:34 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/bc4fe978/pom.xml
----------------------------------------------------------------------