You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/02/17 18:42:35 UTC
[2/3] git commit: ISIS-695: updating dependency versions.
ISIS-695: updating dependency versions.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8c381b14
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8c381b14
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8c381b14
Branch: refs/heads/master
Commit: 8c381b148880c2dda85f5eb5dc7e1875753a846e
Parents: e6054f2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 17 17:08:07 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 17 17:08:07 2014 +0000
----------------------------------------------------------------------
component/objectstore/nosql/pom.xml | 4 ++++
component/viewer/scimpi/pom.xml | 6 ++++++
core/pom.xml | 18 +++++++-----------
3 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8c381b14/component/objectstore/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/pom.xml b/component/objectstore/nosql/pom.xml
index 4807c44..08af607 100644
--- a/component/objectstore/nosql/pom.xml
+++ b/component/objectstore/nosql/pom.xml
@@ -117,6 +117,10 @@
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
+ <!--
+ upgrading the dependency caused tests to fail...
+ <version>20140107</version>
+ -->
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/8c381b14/component/viewer/scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/pom.xml b/component/viewer/scimpi/pom.xml
index cccd2d0..07a07e7 100644
--- a/component/viewer/scimpi/pom.xml
+++ b/component/viewer/scimpi/pom.xml
@@ -115,6 +115,12 @@
<version>2.6</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20140107</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/8c381b14/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 28597b1..54e8709 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1082,12 +1082,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -1110,7 +1110,7 @@ ${license.additional-notes}
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</dependency>
@@ -1126,7 +1126,7 @@ ${license.additional-notes}
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
+ <version>16.0.1</version>
</dependency>
<!-- Google Guice (dependency injection) -->
@@ -1145,7 +1145,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -1173,17 +1173,12 @@ ${license.additional-notes}
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.5</version>
+ <version>1.4.7</version>
</dependency>
<!-- JSON libraries -->
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.11</version>
@@ -1212,6 +1207,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ <!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
<version>2.3.1</version>
</dependency>