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/04/14 12:10:55 UTC
[1/3] syncope git commit: Upgrading H2 and Tomcat
Repository: syncope
Updated Branches:
refs/heads/1_2_X 320284629 -> a685073a0
refs/heads/master 5cb056fe9 -> f1179b530
Upgrading H2 and Tomcat
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a685073a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a685073a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a685073a
Branch: refs/heads/1_2_X
Commit: a685073a0bf59efbce27061c31f02807d3597ab0
Parents: 3202846
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Apr 14 12:09:45 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Apr 14 12:09:45 2015 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a685073a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc4c49d..d2ceae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,7 +362,7 @@ under the License.
<groovy.version>2.3.10</groovy.version>
- <h2.version>1.4.186</h2.version>
+ <h2.version>1.4.187</h2.version>
<log4j.version>2.2</log4j.version>
<slf4j.version>1.7.12</slf4j.version>
@@ -375,7 +375,7 @@ under the License.
<httpclient.version>4.3.6</httpclient.version>
- <tomcat.version>7.0.59</tomcat.version>
+ <tomcat.version>7.0.61</tomcat.version>
<jasypt.version>1.9.2</jasypt.version>
[3/3] syncope git commit: Merge from 1_2_X
Posted by il...@apache.org.
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/f1179b53
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f1179b53
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f1179b53
Branch: refs/heads/master
Commit: f1179b53082dbd0d030de6955c6e9f6ba115e414
Parents: 5cb056f a685073
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Apr 14 12:10:39 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Apr 14 12:10:39 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f1179b53/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index ccb9c78,d2ceae2..22650c8
--- a/pom.xml
+++ b/pom.xml
@@@ -326,50 -335,50 +326,50 @@@ under the License
<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>
- <commons-codec.version>1.10</commons-codec.version>
+ <cxf.version>3.0.4</cxf.version>
- <activiti.version>5.16.4</activiti.version>
+ <camel.version>2.15.0</camel.version>
- <aspectj.version>1.8.5</aspectj.version>
+ <jackson.version>2.5.2</jackson.version>
- <cxf.version>3.0.4</cxf.version>
- <spring.version>4.0.9.RELEASE</spring.version>
+ <spring.version>4.1.6.RELEASE</spring.version>
<spring-security.version>3.2.7.RELEASE</spring-security.version>
- <jackson.version>2.4.5</jackson.version>
- <velocity.version>1.7</velocity.version>
- <velocitytools.version>2.0</velocitytools.version>
- <quartz.version>2.2.1</quartz.version>
<openjpa.version>2.3.0</openjpa.version>
+ <commons-dbcp.version>2.1</commons-dbcp.version>
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
- <commons-dbcp.version>1.4</commons-dbcp.version>
- <commons.logging.version>1.1.3</commons.logging.version>
- <cocoon.version>3.0.0-alpha-3</cocoon.version>
+ <jasypt.version>1.9.2</jasypt.version>
- <wicket.version>6.19.0</wicket.version>
+ <quartz.version>2.2.1</quartz.version>
- <groovy.version>2.3.10</groovy.version>
+ <cocoon.version>3.0.0-alpha-3</cocoon.version>
- <h2.version>1.4.187</h2.version>
+ <groovy.version>2.4.3</groovy.version>
+
+ <activiti.version>5.16.4</activiti.version>
- <log4j.version>2.2</log4j.version>
<slf4j.version>1.7.12</slf4j.version>
+ <log4j.version>2.2</log4j.version>
<disruptor.version>3.3.2</disruptor.version>
- <junit.version>4.11</junit.version>
- <selenium.version>2.45.0</selenium.version>
+ <commons-io.version>2.4</commons-io.version>
+ <commons-codec.version>1.10</commons-codec.version>
+ <commons-jexl.version>2.1.1</commons-jexl.version>
+ <commons-lang.version>3.4</commons-lang.version>
+ <commons.logging.version>1.1.3</commons.logging.version>
- <h2.version>1.4.186</h2.version>
- <apacheds.version>1.5.7</apacheds.version>
-
- <httpclient.version>4.3.6</httpclient.version>
++ <h2.version>1.4.187</h2.version>
- <tomcat.version>7.0.61</tomcat.version>
+ <junit.version>4.12</junit.version>
+ <selenium.version>2.45.0</selenium.version>
- <jasypt.version>1.9.2</jasypt.version>
-
+ <conf.directory>${project.build.directory}/test-classes</conf.directory>
+ <bundles.directory>${project.build.directory}/bundles</bundles.directory>
+ <connid.location>file:${bundles.directory}/</connid.location>
+ <log.directory>${project.build.directory}/log</log.directory>
+ <activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
+
<jquery.version>1.11.1</jquery.version>
<jquery-ui.version>1.10.4</jquery-ui.version>
<highlightjs.version>8.0</highlightjs.version>
[2/3] syncope git commit: Upgrading H2 and Tomcat
Posted by il...@apache.org.
Upgrading H2 and Tomcat
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a685073a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a685073a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a685073a
Branch: refs/heads/master
Commit: a685073a0bf59efbce27061c31f02807d3597ab0
Parents: 3202846
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Apr 14 12:09:45 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Apr 14 12:09:45 2015 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a685073a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc4c49d..d2ceae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,7 +362,7 @@ under the License.
<groovy.version>2.3.10</groovy.version>
- <h2.version>1.4.186</h2.version>
+ <h2.version>1.4.187</h2.version>
<log4j.version>2.2</log4j.version>
<slf4j.version>1.7.12</slf4j.version>
@@ -375,7 +375,7 @@ under the License.
<httpclient.version>4.3.6</httpclient.version>
- <tomcat.version>7.0.59</tomcat.version>
+ <tomcat.version>7.0.61</tomcat.version>
<jasypt.version>1.9.2</jasypt.version>