Repository: hive Updated Branches: refs/heads/master bddf5a7a9 -> 1aad3be28
HIVE-15914: Fix issues with druid-handler pom file (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1aad3be2 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1aad3be2 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1aad3be2 Branch: refs/heads/master Commit: 1aad3be28ffd06bf56dc743d4738fe850723cca4 Parents: bddf5a7 Author: Jesus Camacho Rodriguez <[email protected]> Authored: Tue Feb 14 17:11:34 2017 +0000 Committer: Jesus Camacho Rodriguez <[email protected]> Committed: Wed Feb 15 10:13:56 2017 +0000 ---------------------------------------------------------------------- druid-handler/pom.xml | 33 +++++++++++++--- .../hive/ql/io/DruidRecordWriterTest.java | 2 +- pom.xml | 41 ++++++++------------ 3 files changed, 46 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/1aad3be2/druid-handler/pom.xml ---------------------------------------------------------------------- diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index a7a0f8f..ca5028d 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -137,6 +137,20 @@ <groupId>io.druid.extensions</groupId> <artifactId>druid-hdfs-storage</artifactId> <version>${druid.version}</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.druid.extensions</groupId> @@ -199,11 +213,6 @@ <artifactId>calcite-druid</artifactId> <version>${calcite.version}</version> </dependency> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>2.8.2</version> - </dependency> <!-- test inter-project --> <dependency> <groupId>junit</groupId> @@ -216,6 +225,20 @@ <artifactId>druid-indexing-hadoop</artifactId> <version>${druid.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/hive/blob/1aad3be2/druid-handler/src/test/org/apache/hadoop/hive/ql/io/DruidRecordWriterTest.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/test/org/apache/hadoop/hive/ql/io/DruidRecordWriterTest.java b/druid-handler/src/test/org/apache/hadoop/hive/ql/io/DruidRecordWriterTest.java index b1310b6..f72a735 100644 --- a/druid-handler/src/test/org/apache/hadoop/hive/ql/io/DruidRecordWriterTest.java +++ b/druid-handler/src/test/org/apache/hadoop/hive/ql/io/DruidRecordWriterTest.java @@ -231,7 +231,7 @@ public class DruidRecordWriterTest { @Test public void testSerDesr() throws IOException { String segment = "{\"dataSource\":\"datasource2015\",\"interval\":\"2015-06-01T00:00:00.000-04:00/2015-06-02T00:00:00.000-04:00\",\"version\":\"2016-11-04T19:24:01.732-04:00\",\"loadSpec\":{\"type\":\"hdfs\",\"path\":\"hdfs://cn105-10.l42scl.hortonworks.com:8020/apps/hive/warehouse/druid.db/.hive-staging_hive_2016-11-04_19-23-50_168_1550339856804207572-1/_task_tmp.-ext-10002/_tmp.000000_0/datasource2015/20150601T000000.000-0400_20150602T000000.000-0400/2016-11-04T19_24_01.732-04_00/0/index.zip\"},\"dimensions\":\"dimension1\",\"metrics\":\"bigint\",\"shardSpec\":{\"type\":\"linear\",\"partitionNum\":0},\"binaryVersion\":9,\"size\":1765,\"identifier\":\"datasource2015_2015-06-01T00:00:00.000-04:00_2015-06-02T00:00:00.000-04:00_2016-11-04T19:24:01.732-04:00\"}"; - DataSegment dataSegment = objectMapper.readerFor(DataSegment.class) + DataSegment dataSegment = objectMapper.reader(DataSegment.class) .readValue(segment); Assert.assertTrue(dataSegment.getDataSource().equals("datasource2015")); } http://git-wip-us.apache.org/repos/asf/hive/blob/1aad3be2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 08c8b9c..3c46ad1 100644 --- a/pom.xml +++ b/pom.xml @@ -1001,6 +1001,23 @@ <fail>true</fail> </configuration> </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <excludes> + <!--LGPL licenced library--> + <exclude>com.google.code.findbugs:annotations</exclude> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -1128,30 +1145,6 @@ <artifactId>jamon-maven-plugin</artifactId> <version>${jamon.plugin.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> - <executions> - <execution> - <id>enforce-banned-dependencies</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <bannedDependencies> - <excludes> - <!--LGPL licenced library--> - <exclude>com.google.code.findbugs:annotations</exclude> - </excludes> - </bannedDependencies> - </rules> - <fail>true</fail> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build>
