diff --git hcatalog/webhcat/svr/pom.xml hcatalog/webhcat/svr/pom.xml
index 30c987f..9a5e806 100644
--- hcatalog/webhcat/svr/pom.xml
+++ hcatalog/webhcat/svr/pom.xml
@@ -180,5 +180,38 @@
+
+
+
+
+ org.eclipse.m2e
+ lifecycle-mapping
+ 1.0.0
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-javadoc-plugin
+
+ [2.4,)
+
+ javadoc
+
+
+
+
+
+
+
+
+
+
+
+
diff --git metastore/pom.xml metastore/pom.xml
index 7cf3d59..9523f96 100644
--- metastore/pom.xml
+++ metastore/pom.xml
@@ -167,6 +167,36 @@
+
+
+
+
+ org.eclipse.m2e
+ lifecycle-mapping
+ 1.0.0
+
+
+
+
+
+ org.datanucleus
+ datanucleus-maven-plugin
+ [3.3.0-release,)
+
+ enhance
+
+
+
+
+
+
+
+
+
+
+
+
org.antlr
diff --git pom.xml pom.xml
index 0f115c4..d2198d1 100644
--- pom.xml
+++ pom.xml
@@ -215,7 +215,7 @@
org.apache.maven.plugins
maven-assembly-plugin
- 2.4
+ 2.3
org.apache.maven.plugins
@@ -264,6 +264,32 @@
+
+
+ org.eclipse.m2e
+ lifecycle-mapping
+ 1.0.0
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ [1.7,)
+
+ run
+
+
+
+
+
+
+
+
+
+
diff --git shims/assembly/pom.xml shims/assembly/pom.xml
new file mode 100644
index 0000000..2285d8a
--- /dev/null
+++ shims/assembly/pom.xml
@@ -0,0 +1,115 @@
+
+
+
+ 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.eclipse.m2e
+ lifecycle-mapping
+ 1.0.0
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ [2.4,)
+
+ single
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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..1194c8a 100644
--- shims/pom.xml
+++ shims/pom.xml
@@ -23,7 +23,7 @@
../pom.xml
- hive-shims
+ hive-shims-aggregator
pom
Hive Shims
@@ -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
-
-
-
-