syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [4/6] syncope git commit: Merge branch 'master' into SYNCOPE-119
Date Wed, 08 Apr 2015 08:00:51 GMT
Merge branch 'master' into SYNCOPE-119

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/c5d8c896
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c5d8c896
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c5d8c896

Branch: refs/heads/SYNCOPE-119
Commit: c5d8c89693aa05dadd775524d763b777a61c58fc
Parents: 101b107 f99ea4c
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Tue Apr 7 13:25:14 2015 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Tue Apr 7 13:25:14 2015 +0200

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/c5d8c896/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index f5fe484,9b10760..2c1e1b6
--- a/pom.xml
+++ b/pom.xml
@@@ -356,8 -356,7 +356,8 @@@ under the License
      <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.3.2</commons-lang.version>
+     <commons-lang.version>3.4</commons-lang.version>
 +    <commons-collection.version>4.0</commons-collection.version>
      <commons.logging.version>1.1.3</commons.logging.version>
  
      <h2.version>1.4.186</h2.version>


Mime
View raw message