diff --git ql/pom.xml ql/pom.xml index fc65608..90dfb2c 100644 --- ql/pom.xml +++ ql/pom.xml @@ -356,7 +356,12 @@ commons-lang:commons-lang org.json:json org.apache.avro:arvro-mapred - org.apache.hive:hive-shims + org.apache.hive.shims:hive-shims-0.20 + org.apache.hive.shims:hive-shims-0.20S + org.apache.hive.shims:hive-shims-0.23 + org.apache.hive.shims:hive-shims-0.23 + org.apache.hive.shims:hive-shims-common + org.apache.hive.shims:hive-shims-common-secure com.googlecode.javaewah:JavaEWAH javolution:javolution com.google.protobuf:protobuf-java diff --git shims/aggregator/pom.xml shims/aggregator/pom.xml new file mode 100644 index 0000000..7aa8c4c --- /dev/null +++ shims/aggregator/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + org.apache.hive + hive + 0.13.0-SNAPSHOT + ../../pom.xml + + + hive-shims + jar + Hive Shims + + + ../.. + + + + + + org.apache.hive.shims + hive-shims-common + ${project.version} + compile + + + org.apache.hive.shims + hive-shims-0.20 + ${project.version} + runtime + + + org.apache.hive.shims + hive-shims-common-secure + ${project.version} + compile + + + org.apache.hive.shims + hive-shims-0.20S + ${project.version} + runtime + + + org.apache.hive.shims + hive-shims-0.23 + ${project.version} + runtime + + + diff --git shims/assembly/pom.xml shims/assembly/pom.xml deleted file mode 100644 index a03ebff..0000000 --- shims/assembly/pom.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - 4.0.0 - - org.apache.hive - hive - 0.13.0-SNAPSHOT - ../../pom.xml - - - hive-shims - jar - Hive Shims - - - ../.. - - - - - - org.apache.hive.shims - hive-shims-common - ${project.version} - true - - - org.apache.hive.shims - hive-shims-0.20 - ${project.version} - true - - - org.apache.hive.shims - hive-shims-common-secure - ${project.version} - true - - - org.apache.hive.shims - hive-shims-0.20S - ${project.version} - true - - - org.apache.hive.shims - hive-shims-0.23 - ${project.version} - true - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - false - - src/assemble/uberjar.xml - - - - - uberjar - package - - single - - - - - - - diff --git shims/assembly/src/assemble/uberjar.xml shims/assembly/src/assemble/uberjar.xml deleted file mode 100644 index 3eba66d..0000000 --- shims/assembly/src/assemble/uberjar.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - uberjar - - jar - - false - - - true - runtime - true - false - - org.slf4j:slf4j-api - org.slf4j:slf4j-log4j12 - - - - diff --git shims/pom.xml shims/pom.xml index 8c14d9b..9843836 100644 --- shims/pom.xml +++ shims/pom.xml @@ -37,6 +37,6 @@ common-secure 0.20S 0.23 - assembly + aggregator