You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2018/03/22 18:09:10 UTC
activemq git commit: AMQ-6934 - Updating Jackson to 2.9.4
Repository: activemq
Updated Branches:
refs/heads/master b77cb88f2 -> d195b01f3
AMQ-6934 - Updating Jackson to 2.9.4
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/d195b01f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d195b01f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d195b01f
Branch: refs/heads/master
Commit: d195b01f3b4d57c230e871e126b30aae747b2ae6
Parents: b77cb88
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Thu Mar 22 14:08:38 2018 -0400
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Thu Mar 22 14:08:59 2018 -0400
----------------------------------------------------------------------
.../scala/org/apache/activemq/leveldb/dfs/DFSLevelDBClient.scala | 3 ++-
pom.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/d195b01f/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBClient.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBClient.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBClient.scala
index 586aff8..5576cb7 100644
--- a/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBClient.scala
+++ b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBClient.scala
@@ -290,7 +290,8 @@ class DFSLevelDBClient(val store:DFSLevelDBStore) extends LevelDBClient(store) {
indexFileRefCounters.getOrElseUpdate(target.getName, new LongCounter()).incrementAndGet()
using(dfs.create(target, true, 1024*32, dfsReplication.toShort, dfsBlockSize)) { os=>
- JsonCodec.mapper.writeValue(os, mf)
+ var outputStream:OutputStream = os.asInstanceOf[OutputStream]
+ JsonCodec.mapper.writeValue(outputStream, mf)
}
snapshots += snapshot_id -> Snapshot(mf.current_manifest, Set(mf.files.toSeq:_*))
http://git-wip-us.apache.org/repos/asf/activemq/blob/d195b01f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ac953f..b6facbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
<httpclient-version>4.5.3</httpclient-version>
<httpcore-version>4.4.6</httpcore-version>
<insight-version>1.2.0.Beta4</insight-version>
- <jackson-version>2.6.7</jackson-version>
+ <jackson-version>2.9.4</jackson-version>
<jasypt-version>1.9.2</jasypt-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
<jdom-version>1.0</jdom-version>