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/12 10:08:34 UTC
[1/8] syncope git commit: Fix build problems due to recent ConnId AD
bundle upgrade; upgrading some other deps as well
Repository: syncope
Updated Branches:
refs/heads/1_1_X 5641a5c7d -> 0ebf6ca30
refs/heads/1_2_X b836d8c65 -> 49ecca4a8
refs/heads/master c444fe31c -> 1a126a0a5
Fix build problems due to recent ConnId AD bundle upgrade; upgrading some other deps as well
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0ebf6ca3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0ebf6ca3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0ebf6ca3
Branch: refs/heads/1_1_X
Commit: 0ebf6ca30d6984223825219e309837aeeab0d7ee
Parents: 5641a5c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 09:53:50 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 09:53:50 2014 +0100
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0ebf6ca3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a43b318..dc714ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,7 +311,7 @@ under the License.
<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>
+ <connid.ad.version>1.1.5-SNAPSHOT</connid.ad.version>
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>3.3.2</commons-lang.version>
@@ -321,7 +321,7 @@ under the License.
<activiti.version>5.15.1</activiti.version>
<cxf.version>2.7.13</cxf.version>
- <spring.version>3.2.11.RELEASE</spring.version>
+ <spring.version>3.2.12.RELEASE</spring.version>
<spring-security.version>3.1.7.RELEASE</spring-security.version>
<aspectj.version>1.7.4</aspectj.version>
<jackson.version>1.9.13</jackson.version>
@@ -336,7 +336,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <wicket.version>6.17.0</wicket.version>
+ <wicket.version>6.18.0</wicket.version>
<groovy.version>2.2.2</groovy.version>
@@ -1176,7 +1176,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
[8/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/1a126a0a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1a126a0a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1a126a0a
Branch: refs/heads/master
Commit: 1a126a0a588cea7b22daf7117f3034d8dc2aec24
Parents: c444fe3 49ecca4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 10:08:14 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 10:08:14 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/1a126a0a/pom.xml
----------------------------------------------------------------------
[3/8] syncope git commit: Fix build problems due to recent ConnId AD
bundle upgrade; upgrading some other deps as well
Posted by il...@apache.org.
Fix build problems due to recent ConnId AD bundle upgrade; upgrading some other deps as well
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0ebf6ca3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0ebf6ca3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0ebf6ca3
Branch: refs/heads/master
Commit: 0ebf6ca30d6984223825219e309837aeeab0d7ee
Parents: 5641a5c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 09:53:50 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 09:53:50 2014 +0100
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0ebf6ca3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a43b318..dc714ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,7 +311,7 @@ under the License.
<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>
+ <connid.ad.version>1.1.5-SNAPSHOT</connid.ad.version>
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>3.3.2</commons-lang.version>
@@ -321,7 +321,7 @@ under the License.
<activiti.version>5.15.1</activiti.version>
<cxf.version>2.7.13</cxf.version>
- <spring.version>3.2.11.RELEASE</spring.version>
+ <spring.version>3.2.12.RELEASE</spring.version>
<spring-security.version>3.1.7.RELEASE</spring-security.version>
<aspectj.version>1.7.4</aspectj.version>
<jackson.version>1.9.13</jackson.version>
@@ -336,7 +336,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <wicket.version>6.17.0</wicket.version>
+ <wicket.version>6.18.0</wicket.version>
<groovy.version>2.2.2</groovy.version>
@@ -1176,7 +1176,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
[2/8] syncope git commit: Fix build problems due to recent ConnId AD
bundle upgrade; upgrading some other deps as well
Posted by il...@apache.org.
Fix build problems due to recent ConnId AD bundle upgrade; upgrading some other deps as well
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0ebf6ca3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0ebf6ca3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0ebf6ca3
Branch: refs/heads/1_2_X
Commit: 0ebf6ca30d6984223825219e309837aeeab0d7ee
Parents: 5641a5c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 09:53:50 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 09:53:50 2014 +0100
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0ebf6ca3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a43b318..dc714ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,7 +311,7 @@ under the License.
<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>
+ <connid.ad.version>1.1.5-SNAPSHOT</connid.ad.version>
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>3.3.2</commons-lang.version>
@@ -321,7 +321,7 @@ under the License.
<activiti.version>5.15.1</activiti.version>
<cxf.version>2.7.13</cxf.version>
- <spring.version>3.2.11.RELEASE</spring.version>
+ <spring.version>3.2.12.RELEASE</spring.version>
<spring-security.version>3.1.7.RELEASE</spring-security.version>
<aspectj.version>1.7.4</aspectj.version>
<jackson.version>1.9.13</jackson.version>
@@ -336,7 +336,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <wicket.version>6.17.0</wicket.version>
+ <wicket.version>6.18.0</wicket.version>
<groovy.version>2.2.2</groovy.version>
@@ -1176,7 +1176,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
[5/8] syncope git commit: Merge branch '1_1_X' into 1_2_X
Posted by il...@apache.org.
Merge branch '1_1_X' into 1_2_X
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b3fe89a3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b3fe89a3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b3fe89a3
Branch: refs/heads/master
Commit: b3fe89a30bc33dcd7aa393252861774c4132720c
Parents: b836d8c 0ebf6ca
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 09:55:02 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 09:55:02 2014 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/8] syncope git commit: Merge branch '1_1_X' into 1_2_X
Posted by il...@apache.org.
Merge branch '1_1_X' into 1_2_X
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b3fe89a3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b3fe89a3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b3fe89a3
Branch: refs/heads/1_2_X
Commit: b3fe89a30bc33dcd7aa393252861774c4132720c
Parents: b836d8c 0ebf6ca
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 09:55:02 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 09:55:02 2014 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/8] syncope git commit: Upgrading Spring
Posted by il...@apache.org.
Upgrading Spring
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/49ecca4a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/49ecca4a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/49ecca4a
Branch: refs/heads/master
Commit: 49ecca4a8c6248d884a26dbfb83b014f6c53b4d3
Parents: b3fe89a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 10:00:33 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 10:00:33 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/49ecca4a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 71dfbb9..db5d3de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,7 @@ under the License.
<aspectj.version>1.8.4</aspectj.version>
<cxf.version>3.0.2</cxf.version>
- <spring.version>4.0.7.RELEASE</spring.version>
+ <spring.version>4.0.8.RELEASE</spring.version>
<spring-security.version>3.2.5.RELEASE</spring-security.version>
<jackson.version>2.4.3</jackson.version>
<velocity.version>1.7</velocity.version>
[7/8] syncope git commit: Upgrading Spring
Posted by il...@apache.org.
Upgrading Spring
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/49ecca4a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/49ecca4a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/49ecca4a
Branch: refs/heads/1_2_X
Commit: 49ecca4a8c6248d884a26dbfb83b014f6c53b4d3
Parents: b3fe89a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 10:00:33 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 10:00:33 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/49ecca4a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 71dfbb9..db5d3de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,7 @@ under the License.
<aspectj.version>1.8.4</aspectj.version>
<cxf.version>3.0.2</cxf.version>
- <spring.version>4.0.7.RELEASE</spring.version>
+ <spring.version>4.0.8.RELEASE</spring.version>
<spring-security.version>3.2.5.RELEASE</spring-security.version>
<jackson.version>2.4.3</jackson.version>
<velocity.version>1.7</velocity.version>