Repository: drill Updated Branches: refs/heads/master 46fac0adc -> 05d8b3c2c
DRILL-5987: Use one version of javassist closes #1048 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/bfaec288 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/bfaec288 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/bfaec288 Branch: refs/heads/master Commit: bfaec2882e69e3a4a753ae96b7619c4331506255 Parents: 46fac0a Author: Timothy Farkas <timothyfar...@apache.org> Authored: Wed Nov 22 12:31:18 2017 -0800 Committer: Arina Ielchiieva <arina.yelchiy...@gmail.com> Committed: Sun Nov 26 15:23:43 2017 +0200 ---------------------------------------------------------------------- common/pom.xml | 7 +++++-- logical/pom.xml | 12 ------------ pom.xml | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/bfaec288/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index d3cf984..b6943e9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -62,13 +62,16 @@ <dependency> <groupId>org.msgpack</groupId> <artifactId>msgpack</artifactId> - <version>0.6.6</version> </dependency> <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> - <version>0.9.8</version> + </dependency> + + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/drill/blob/bfaec288/logical/pom.xml ---------------------------------------------------------------------- diff --git a/logical/pom.xml b/logical/pom.xml index 36f7aed..2b712de 100644 --- a/logical/pom.xml +++ b/logical/pom.xml @@ -73,18 +73,6 @@ </dependency> <dependency> - <groupId>org.msgpack</groupId> - <artifactId>msgpack</artifactId> - <version>0.6.6</version> - </dependency> - - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>0.9.8</version> - </dependency> - - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> <version>${jackson.version}</version> http://git-wip-us.apache.org/repos/asf/drill/blob/bfaec288/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b5e4fff..0254615 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,9 @@ <hbase.version>1.1.3</hbase.version> <fmpp.version>0.9.15</fmpp.version> <freemarker.version>2.3.26-incubating</freemarker.version> + <javassist.version>3.16.1-GA</javassist.version> + <msgpack.version>0.6.6</msgpack.version> + <reflections.version>0.9.8</reflections.version> <excludedGroups></excludedGroups> </properties> @@ -693,6 +696,27 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>org.msgpack</groupId> + <artifactId>msgpack</artifactId> + <version>${msgpack.version}</version> + </dependency> + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>${reflections.version}</version> + <exclusions> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + </dependency> + <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> <version>${freemarker.version}</version>
