Skip to content

Commit 52a4ab8

Browse files
authored
HIVE-24551: Hive should include transitive dependencies from calcite after shading it (apache#1792)
1 parent 8c1dd36 commit 52a4ab8

File tree

3 files changed

+52
-2
lines changed

3 files changed

+52
-2
lines changed

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ setPrLabel("PENDING");
6767

6868
def executorNode(run) {
6969
hdbPodTemplate {
70-
timeout(time: 24, unit: 'HOURS') {
70+
timeout(time: 4, unit: 'HOURS') {
7171
node(POD_LABEL) {
7272
container('hdb') {
7373
run()

pom.xml

+35-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<maven.build-helper.plugin.version>1.8</maven.build-helper.plugin.version>
107107

108108
<!-- Library Dependency Versions -->
109-
<accumulo.version>1.6.0</accumulo.version>
109+
<accumulo.version>1.7.3</accumulo.version>
110110
<activemq.version>5.5.0</activemq.version>
111111
<ant.version>1.9.1</ant.version>
112112
<antlr.version>3.5.2</antlr.version>
@@ -135,6 +135,7 @@
135135
<dropwizard.version>3.1.0</dropwizard.version>
136136
<dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2</dropwizard-metrics-hadoop-metrics2-reporter.version>
137137
<druid.version>0.9.2</druid.version>
138+
<eigenbase-properties.version>1.1.5</eigenbase-properties.version>
138139
<guava.version>14.0.1</guava.version>
139140
<groovy.version>2.4.4</groovy.version>
140141
<h2database.version>1.3.166</h2database.version>
@@ -155,6 +156,7 @@
155156
<jasper.version>5.5.23</jasper.version>
156157
<jamon.plugin.version>2.3.4</jamon.plugin.version>
157158
<jamon-runtime.version>2.3.1</jamon-runtime.version>
159+
<janino.version>2.7.6</janino.version>
158160
<javaewah.version>0.3.2</javaewah.version>
159161
<javax-servlet.version>3.0.0.v201112011016</javax-servlet.version>
160162
<javolution.version>5.5.1</javolution.version>
@@ -180,6 +182,7 @@
180182
<mina.version>2.0.0-M5</mina.version>
181183
<netty.version>4.0.52.Final</netty.version>
182184
<parquet.version>1.8.1</parquet.version>
185+
<pentaho-aggdesigner.version>5.1.5-jhyde</pentaho-aggdesigner.version>
183186
<pig.version>0.16.0</pig.version>
184187
<protobuf.version>2.5.0</protobuf.version>
185188
<stax.version>1.0.1</stax.version>
@@ -217,6 +220,17 @@
217220
<checksumPolicy>warn</checksumPolicy>
218221
</releases>
219222
</repository>
223+
<repository>
224+
<id>conjars</id>
225+
<name>Conjars</name>
226+
<url>http://conjars.org/repo</url>
227+
<layout>default</layout>
228+
<releases>
229+
<enabled>true</enabled>
230+
<updatePolicy>always</updatePolicy>
231+
<checksumPolicy>warn</checksumPolicy>
232+
</releases>
233+
</repository>
220234
</repositories>
221235

222236
<dependencyManagement>
@@ -359,6 +373,11 @@
359373
<artifactId>junit</artifactId>
360374
<version>${junit.version}</version>
361375
</dependency>
376+
<dependency>
377+
<groupId>net.hydromatic</groupId>
378+
<artifactId>eigenbase-properties</artifactId>
379+
<version>${eigenbase-properties.version}</version>
380+
</dependency>
362381
<dependency>
363382
<groupId>org.apache.logging.log4j</groupId>
364383
<artifactId>log4j-1.2-api</artifactId>
@@ -573,6 +592,16 @@
573592
<artifactId>jackson-xc</artifactId>
574593
<version>${jackson.version}</version>
575594
</dependency>
595+
<dependency>
596+
<groupId>org.codehaus.janino</groupId>
597+
<artifactId>commons-compiler</artifactId>
598+
<version>${janino.version}</version>
599+
</dependency>
600+
<dependency>
601+
<groupId>org.codehaus.janino</groupId>
602+
<artifactId>janino</artifactId>
603+
<version>${janino.version}</version>
604+
</dependency>
576605
<dependency>
577606
<groupId>org.codehaus.jettison</groupId>
578607
<artifactId>jettison</artifactId>
@@ -728,6 +757,11 @@
728757
<artifactId>hadoop-minicluster</artifactId>
729758
<version>${hadoop.version}</version>
730759
</dependency>
760+
<dependency>
761+
<groupId>org.pentaho</groupId>
762+
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
763+
<version>${pentaho-aggdesigner.version}</version>
764+
</dependency>
731765
<dependency>
732766
<groupId>org.scala-lang</groupId>
733767
<artifactId>scala-library</artifactId>

ql/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,22 @@
711711
<version>${glassfish.jersey.version}</version>
712712
<scope>test</scope>
713713
</dependency>
714+
<dependency>
715+
<groupId>net.hydromatic</groupId>
716+
<artifactId>eigenbase-properties</artifactId>
717+
</dependency>
718+
<dependency>
719+
<groupId>org.codehaus.janino</groupId>
720+
<artifactId>commons-compiler</artifactId>
721+
</dependency>
722+
<dependency>
723+
<groupId>org.codehaus.janino</groupId>
724+
<artifactId>janino</artifactId>
725+
</dependency>
726+
<dependency>
727+
<groupId>org.pentaho</groupId>
728+
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
729+
</dependency>
714730
</dependencies>
715731

716732
<profiles>

0 commit comments

Comments
 (0)