diff --git beeline/pom.xml beeline/pom.xml
index 48a6edd..877910b 100644
--- beeline/pom.xml
+++ beeline/pom.xml
@@ -47,7 +47,6 @@
org.apache.hive
hive-shims
${project.version}
- uberjar
runtime
diff --git cli/pom.xml cli/pom.xml
index 0923433..cc04321 100644
--- cli/pom.xml
+++ cli/pom.xml
@@ -57,7 +57,6 @@
org.apache.hive
hive-shims
${project.version}
- uberjar
org.apache.hive
diff --git common/pom.xml common/pom.xml
index ca1b2a7..0c62d9e 100644
--- common/pom.xml
+++ common/pom.xml
@@ -37,7 +37,6 @@
org.apache.hive
hive-shims
${project.version}
- uberjar
diff --git contrib/pom.xml contrib/pom.xml
index d494e00..59a3cf9 100644
--- contrib/pom.xml
+++ contrib/pom.xml
@@ -47,7 +47,6 @@
org.apache.hive
hive-shims
${project.version}
- uberjar
diff --git hbase-handler/pom.xml hbase-handler/pom.xml
index b040f01..c39f29a 100644
--- hbase-handler/pom.xml
+++ hbase-handler/pom.xml
@@ -62,7 +62,6 @@
org.apache.hive
hive-shims
${project.version}
- uberjar
diff --git hcatalog/webhcat/svr/pom.xml hcatalog/webhcat/svr/pom.xml
index 30c987f..b392643 100644
--- hcatalog/webhcat/svr/pom.xml
+++ hcatalog/webhcat/svr/pom.xml
@@ -140,7 +140,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- ${maven-javadoc-plugin.version}
+ ${maven.javadoc.plugin.version}
resourcesdoc.xml
diff --git hwi/pom.xml hwi/pom.xml
index 5a4c089..240e729 100644
--- hwi/pom.xml
+++ hwi/pom.xml
@@ -47,7 +47,6 @@
org.apache.hive
hive-shims
${project.version}
- uberjar
org.apache.hive
diff --git itests/qtest/pom.xml itests/qtest/pom.xml
index ad36b18..f487178 100644
--- itests/qtest/pom.xml
+++ itests/qtest/pom.xml
@@ -409,7 +409,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 1.8
+ ${build.helper.maven.plugin.version}
add-test-sources
diff --git metastore/pom.xml metastore/pom.xml
index 7cf3d59..c2cb1d3 100644
--- metastore/pom.xml
+++ metastore/pom.xml
@@ -42,7 +42,6 @@
org.apache.hive
hive-shims
${project.version}
- uberjar
diff --git pom.xml pom.xml
index f41e4d2..ce637be 100644
--- pom.xml
+++ pom.xml
@@ -49,14 +49,33 @@
0.13.0
+
UTF-8
+ false
${user.home}/.m2/repository
.
+
+
${project.build.directory}/tmp
${project.build.directory}/warehouse
pfile://
-
+
+ 1.0b3
+ 1.8
+ 3.3.0-release
+ 1.7
+ 2.3
+ 3.1
+ 1.3.1
+ 2.4
+ 2.2
+ 2.4
+ 2.1
+ 2.16
+ 2.4
+
+
5.5.0
1.9.1
3.4
@@ -101,7 +120,6 @@
0.9.0
0.9.0
1.2.16
- 2.4
1.8.2
2.0.0-M5
0.10.1
@@ -115,7 +133,6 @@
1.5
2.9.1
3.4.3
- false
@@ -189,7 +206,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.1
+ ${maven.compiler.plugin.version}
1.6
1.6
@@ -198,12 +215,12 @@
org.apache.maven.plugins
maven-antrun-plugin
- 1.7
+ ${maven.antrun.plugin.version}
ant-contrib
ant-contrib
- 1.0b3
+ ${ant.contrib.version}
ant
@@ -216,47 +233,47 @@
org.apache.maven.plugins
maven-assembly-plugin
- 2.4
+ ${maven.assembly.plugin.version}
org.apache.maven.plugins
maven-enforcer-plugin
- 1.3.1
+ ${maven.enforcer.plugin.version}
org.apache.maven.plugins
maven-install-plugin
- 2.4
+ ${maven.install.plugin.version}
org.apache.maven.plugins
maven-shade-plugin
- 2.1
+ ${maven.shade.plugin.version}
org.apache.maven.plugins
maven-surefire-plugin
- 2.16
+ ${maven.surefire.plugin.version}
org.apache.maven.plugins
maven-jar-plugin
- 2.2
+ ${maven.jar.plugin.version}
org.apache.maven.plugins
maven-war-plugin
- 2.4
+ ${maven.war.plugin.version}
org.codehaus.mojo
build-helper-maven-plugin
- 1.8
+ ${build.helper.maven.plugin.version}
org.datanucleus
datanucleus-maven-plugin
- 3.3.0-release
+ ${datanucleus.maven.plugin.version}
org.datanucleus
diff --git ql/pom.xml ql/pom.xml
index 131c25e..6e4bd47 100644
--- ql/pom.xml
+++ ql/pom.xml
@@ -334,7 +334,7 @@
commons-lang:commons-lang
org.json:json
org.apache.avro:arvro-mapred
- org.apache.hive:hive-shims:*:uberjar
+ org.apache.hive:hive-shims
com.googlecode.javaewah:JavaEWAH
javolution:javolution
com.google.protobuf:protobuf-java
diff --git serde/pom.xml serde/pom.xml
index 65df5a9..db56135 100644
--- serde/pom.xml
+++ serde/pom.xml
@@ -42,7 +42,6 @@
org.apache.hive
hive-shims
${project.version}
- uberjar
diff --git shims/assembly/pom.xml shims/assembly/pom.xml
new file mode 100644
index 0000000..48997d8
--- /dev/null
+++ shims/assembly/pom.xml
@@ -0,0 +1,85 @@
+
+
+
+ 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}
+
+
+ org.apache.hive.shims
+ hive-shims-0.20
+ ${project.version}
+
+
+ org.apache.hive.shims
+ hive-shims-common-secure
+ ${project.version}
+
+
+ org.apache.hive.shims
+ hive-shims-0.20S
+ ${project.version}
+
+
+ org.apache.hive.shims
+ hive-shims-0.23
+ ${project.version}
+
+
+
+
+
+
+ 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
new file mode 100644
index 0000000..3eba66d
--- /dev/null
+++ shims/assembly/src/assemble/uberjar.xml
@@ -0,0 +1,33 @@
+
+
+
+ uberjar
+
+ jar
+
+ false
+
+
+ true
+ runtime
+ true
+ false
+
+ org.slf4j:slf4j-api
+ org.slf4j:slf4j-log4j12
+
+
+
+
diff --git shims/pom.xml shims/pom.xml
index e41a190..8c14d9b 100644
--- shims/pom.xml
+++ shims/pom.xml
@@ -23,9 +23,9 @@
../pom.xml
- hive-shims
+ hive-shims-aggregator
pom
- Hive Shims
+ Hive Shims Aggregator
..
@@ -37,76 +37,6 @@
common-secure
0.20S
0.23
+ assembly
-
-
-
- org.apache.hive.shims
- hive-shims-common
- ${project.version}
-
-
- org.apache.hive.shims
- hive-shims-0.20
- ${project.version}
-
-
- org.apache.hive.shims
- hive-shims-common-secure
- ${project.version}
-
-
- org.apache.hive.shims
- hive-shims-0.20S
- ${project.version}
-
-
- org.apache.hive.shims
- hive-shims-0.23
- ${project.version}
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- src/assembly/uberjar.xml
-
-
-
-
- compile
-
- single
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- attach-artifacts
- package
-
- attach-artifact
-
-
-
-
- target/hive-shims-${project.version}-uberjar.jar
- jar
-
-
-
-
-
-
-
-
diff --git shims/src/assembly/uberjar.xml shims/src/assembly/uberjar.xml
deleted file mode 100644
index 67ce50b..0000000
--- shims/src/assembly/uberjar.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
- uberjar
-
- jar
-
- false
-
-
- true
- compile
- false
- false
-
- org.slf4j:slf4j-api
- org.slf4j:slf4j-log4j12
-
-
-
-