Repository: mahout Updated Branches: refs/heads/master f344f642b -> 2985b7cc4
MAHOUT-1832: Upgrade Jackson version and references to 2.x, this closes apache/mahout#221 Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/2985b7cc Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/2985b7cc Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/2985b7cc Branch: refs/heads/master Commit: 2985b7cc463035cf991b5fa94cb6c9abd1592466 Parents: f344f64 Author: smarthi <[email protected]> Authored: Sun Apr 17 20:49:06 2016 -0400 Committer: smarthi <[email protected]> Committed: Sun Apr 17 20:49:06 2016 -0400 ---------------------------------------------------------------------- hdfs/pom.xml | 8 ++------ mr/pom.xml | 8 ++------ pom.xml | 13 +++++-------- 3 files changed, 9 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/2985b7cc/hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/hdfs/pom.xml b/hdfs/pom.xml index 20d381f..2e15aac 100644 --- a/hdfs/pom.xml +++ b/hdfs/pom.xml @@ -107,12 +107,8 @@ </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/2985b7cc/mr/pom.xml ---------------------------------------------------------------------- diff --git a/mr/pom.xml b/mr/pom.xml index 7b591dc..4b8df09 100644 --- a/mr/pom.xml +++ b/mr/pom.xml @@ -145,12 +145,8 @@ </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/2985b7cc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c629fc7..5136320 100644 --- a/pom.xml +++ b/pom.xml @@ -124,6 +124,7 @@ <spark.version>1.5.2</spark.version> <flink.version>1.0.1</flink.version> <h2o.version>0.1.25</h2o.version> + <jackson.version>2.7.2</jackson.version> </properties> <issueManagement> <system>Jira</system> @@ -367,15 +368,11 @@ </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.9.12</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.12</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId>
