You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by de...@apache.org on 2017/08/24 16:42:14 UTC
[2/2] flume git commit: FLUME-3112. Upgrade jackson-core library
dependency
FLUME-3112. Upgrade jackson-core library dependency
Upgrading the version in dependency management and removing unused ones.
Both 1.x and 2.x jackson versions are needed, renamed the jackson.version
property to codehaus.jackson.version and added fasterxml.jackson.version
for the 2.x jackson.
This closes #154
Reviewers: Attila Simon, Miklos Csanady, Denes Arvay
(Ferenc Szabo via Denes Arvay)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/3cd1b331
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/3cd1b331
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/3cd1b331
Branch: refs/heads/trunk
Commit: 3cd1b331308d8d312fae258d94cd64a69ceb1644
Parents: aa1aea0
Author: Ferenc Szabo <fs...@cloudera.com>
Authored: Tue Aug 15 10:35:35 2017 +0200
Committer: Denes Arvay <de...@apache.org>
Committed: Thu Aug 24 18:37:40 2017 +0200
----------------------------------------------------------------------
flume-ng-node/pom.xml | 10 ----------
pom.xml | 25 ++++++++++++++++++++++---
2 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/3cd1b331/flume-ng-node/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml
index 133bbf5..437b325 100644
--- a/flume-ng-node/pom.xml
+++ b/flume-ng-node/pom.xml
@@ -151,16 +151,6 @@
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/flume/blob/3cd1b331/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 80b2849..c0bd052 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@ limitations under the License.
<bundle-plugin.version>2.3.7</bundle-plugin.version>
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
<checkstyle.tool.version>6.19</checkstyle.tool.version>
+ <codehaus.jackson.version>1.9.3</codehaus.jackson.version>
<commons-cli.version>1.2</commons-cli.version>
<commons-codec.version>1.8</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
@@ -62,6 +63,7 @@ limitations under the License.
<curator.version>2.6.0</curator.version>
<derby.version>10.11.1.1</derby.version>
<elasticsearch.version>0.90.1</elasticsearch.version>
+ <fasterxml.jackson.version>2.8.9</fasterxml.jackson.version>
<fest-reflect.version>1.4</fest-reflect.version>
<gson.version>2.2.2</gson.version>
<guava.version>18.0</guava.version>
@@ -70,7 +72,6 @@ limitations under the License.
<httpclient.version>4.3.5</httpclient.version>
<httpclient-old.version>4.2.1</httpclient-old.version>
<irclib.version>1.10</irclib.version>
- <jackson.version>1.9.3</jackson.version>
<javax-jms.version>1.1-rev-1</javax-jms.version>
<jersey.version>1.8</jersey.version>
<jetty.version>6.1.26</jetty.version>
@@ -1087,13 +1088,31 @@ limitations under the License.
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>${jackson.version}</version>
+ <version>${codehaus.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
+ <version>${codehaus.jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>