Repository: storm Updated Branches: refs/heads/master 7e622d178 -> c3ae8b97d
STORM-2830: Upgrade to Jackson 2.9.2. Switch to using the Jackson BOM to keep components in sync Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6568fd06 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6568fd06 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6568fd06 Branch: refs/heads/master Commit: 6568fd066df04c18c42f39249cea9673f546c59a Parents: 61a944f Author: Stig Rohde Døssing <[email protected]> Authored: Thu Nov 23 22:48:06 2017 +0100 Committer: Stig Rohde Døssing <[email protected]> Committed: Fri Nov 24 16:34:05 2017 +0100 ---------------------------------------------------------------------- external/storm-hbase/pom.xml | 2 -- external/storm-opentsdb/pom.xml | 2 -- external/storm-redis/pom.xml | 2 -- pom.xml | 20 ++++++-------------- sql/storm-sql-core/pom.xml | 1 - storm-webapp/pom.xml | 4 ++++ 6 files changed, 10 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/6568fd06/external/storm-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml index 47eb448..6d96620 100644 --- a/external/storm-hbase/pom.xml +++ b/external/storm-hbase/pom.xml @@ -105,12 +105,10 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/storm/blob/6568fd06/external/storm-opentsdb/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-opentsdb/pom.xml b/external/storm-opentsdb/pom.xml index 0f9e0c8..78afad6 100644 --- a/external/storm-opentsdb/pom.xml +++ b/external/storm-opentsdb/pom.xml @@ -54,12 +54,10 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> http://git-wip-us.apache.org/repos/asf/storm/blob/6568fd06/external/storm-redis/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml index 9abf9ab..ca70344 100644 --- a/external/storm-redis/pom.xml +++ b/external/storm-redis/pom.xml @@ -64,12 +64,10 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> </dependency> <!--test dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/storm/blob/6568fd06/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index aa4cf8d..543c0d0 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,7 @@ <jedis.version>2.9.0</jedis.version> <rocketmq.version>4.0.0-incubating</rocketmq.version> - <jackson.version>2.6.3</jackson.version> + <jackson.version>2.9.2</jackson.version> <!-- Kafka version used by old storm-kafka spout code --> <storm.kafka.version>0.8.2.2</storm.kafka.version> <storm.kafka.artifact.id>kafka_2.10</storm.kafka.artifact.id> @@ -741,14 +741,11 @@ <version>${joda-time.version}</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-smile</artifactId> + <groupId>com.fasterxml.jackson</groupId> + <artifactId>jackson-bom</artifactId> <version>${jackson.version}</version> + <scope>import</scope> + <type>pom</type> </dependency> <dependency> <groupId>commons-fileupload</groupId> @@ -1007,12 +1004,7 @@ <groupId>org.apache.calcite</groupId> <artifactId>calcite-core</artifactId> <version>${calcite.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> - </dependency> + </dependency> <!-- kafka artifact dependency needed for storm-kafka --> <dependency> http://git-wip-us.apache.org/repos/asf/storm/blob/6568fd06/sql/storm-sql-core/pom.xml ---------------------------------------------------------------------- diff --git a/sql/storm-sql-core/pom.xml b/sql/storm-sql-core/pom.xml index 1723a5f..b58aa20 100644 --- a/sql/storm-sql-core/pom.xml +++ b/sql/storm-sql-core/pom.xml @@ -75,7 +75,6 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>${jackson.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> http://git-wip-us.apache.org/repos/asf/storm/blob/6568fd06/storm-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/storm-webapp/pom.xml b/storm-webapp/pom.xml index 2846146..1c7ecfc 100644 --- a/storm-webapp/pom.xml +++ b/storm-webapp/pom.xml @@ -77,6 +77,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> <dependency> <groupId>io.dropwizard</groupId>
