diff --git a/beeline/ivy.xml b/beeline/ivy.xml
index cfefa76..cdded26 100644
--- a/beeline/ivy.xml
+++ b/beeline/ivy.xml
@@ -45,8 +45,6 @@
conf="compile->default" />
-
-
+
-
+
Writing POM to ${build.dir}/pom.xml
diff --git a/build.properties b/build.properties
index deb9db7..7d71bc1 100644
--- a/build.properties
+++ b/build.properties
@@ -72,10 +72,10 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ext/jsp-api.jar
common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar
# module names needed for build process
-iterate.hive.all=ant,shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils
-iterate.hive.modules=shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils
-iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,hcatalog,odbc,serde,service
-iterate.hive.thrift=ql,service,metastore,hcatalog,serde
+iterate.hive.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils,hcatalog
+iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils,hcatalog
+iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,odbc,serde,service,hcatalog
+iterate.hive.thrift=ql,service,metastore,serde,hcatalog
iterate.hive.protobuf=ql
iterate.hive.cpp=odbc
diff --git a/cli/ivy.xml b/cli/ivy.xml
index 9423edc..f7e86df 100644
--- a/cli/ivy.xml
+++ b/cli/ivy.xml
@@ -35,7 +35,5 @@
conf="compile->default" />
-
diff --git a/hcatalog/build-support/ant/deploy.xml b/hcatalog/build-support/ant/deploy.xml
index 7c32f94..a9adbe6 100644
--- a/hcatalog/build-support/ant/deploy.xml
+++ b/hcatalog/build-support/ant/deploy.xml
@@ -21,6 +21,8 @@
+
+
@@ -38,6 +40,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_mvnpublish module="shims" />
+ <_mvnpublish module="common" />
+ <_mvnpublish module="serde" />
+ <_mvnpublish module="metastore" />
+ <_mvnpublish module="ql" jarname="exec"/>
+ <_mvnpublish module="contrib" />
+ <_mvnpublish module="service" />
+ <_mvnpublish module="cli" />
+ <_mvnpublish module="jdbc" />
+ <_mvnpublish module="beeline" />
+ <_mvnpublish module="hwi" />
+ <_mvnpublish module="hbase-handler" />
+ <_mvnpublish module="pdk" />
+ <_mvnpublish module="testutils" />
+
+
+
diff --git a/hcatalog/build.properties b/hcatalog/build.properties
index ffeff51..fe2de62 100644
--- a/hcatalog/build.properties
+++ b/hcatalog/build.properties
@@ -15,7 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-hcatalog.version=0.11.0-SNAPSHOT
+hive.version=0.12.0-SNAPSHOT
+hcatalog.version=${hive.version}
jar.name=${ant.project.name}-${hcatalog.version}.jar
hcatalog.jar=${ant.project.name}-${hcatalog.version}.jar
hcatalog.core.jar=${ant.project.name}-core-${hcatalog.version}.jar
diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
index de7e2b7..5cc4cc5 100644
--- a/hcatalog/core/pom.xml
+++ b/hcatalog/core/pom.xml
@@ -24,7 +24,7 @@
org.apache.hcatalog
hcatalog
- 0.11.0-SNAPSHOT
+ 0.12.0-SNAPSHOT
../pom.xml
@@ -32,7 +32,6 @@
org.apache.hcatalog
hcatalog-core
jar
- 0.11.0-SNAPSHOT
hcatalog-core
http://maven.apache.org
@@ -61,12 +60,6 @@
org.apache.hive
- hive-builtins
- ${hive.version}
- compile
-
-
- org.apache.hive
hive-cli
${hive.version}
compile
diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml
index 09f4f45..10f4f98 100644
--- a/hcatalog/hcatalog-pig-adapter/pom.xml
+++ b/hcatalog/hcatalog-pig-adapter/pom.xml
@@ -24,7 +24,7 @@
org.apache.hcatalog
hcatalog
- 0.11.0-SNAPSHOT
+ 0.12.0-SNAPSHOT
../pom.xml
@@ -32,7 +32,6 @@
org.apache.hcatalog
hcatalog-pig-adapter
jar
- 0.11.0-SNAPSHOT
hcatalog-pig-adapter
http://maven.apache.org
diff --git a/hcatalog/pom.xml b/hcatalog/pom.xml
index ee4ab72..81f1e71 100644
--- a/hcatalog/pom.xml
+++ b/hcatalog/pom.xml
@@ -30,7 +30,7 @@
2.0.3-alpha
0.94.5
${project.version}
- 0.11.0-SNAPSHOT
+ ${project.version}
1.9.2
1.14
7.6.0.v20120127
@@ -42,16 +42,10 @@
2.1.2
-
- org.apache
- apache
- 11
-
-
4.0.0
org.apache.hcatalog
hcatalog
- 0.11.0-SNAPSHOT
+ 0.12.0-SNAPSHOT
pom
diff --git a/hcatalog/server-extensions/pom.xml b/hcatalog/server-extensions/pom.xml
index b7b3290..ee6d711 100644
--- a/hcatalog/server-extensions/pom.xml
+++ b/hcatalog/server-extensions/pom.xml
@@ -24,7 +24,7 @@
org.apache.hcatalog
hcatalog
- 0.11.0-SNAPSHOT
+ 0.12.0-SNAPSHOT
../pom.xml
@@ -32,7 +32,6 @@
org.apache.hcatalog
hcatalog-server-extensions
jar
- 0.11.0-SNAPSHOT
server-extensions
http://maven.apache.org
diff --git a/hcatalog/storage-handlers/hbase/pom.xml b/hcatalog/storage-handlers/hbase/pom.xml
index f8c7b03..7806c8d 100644
--- a/hcatalog/storage-handlers/hbase/pom.xml
+++ b/hcatalog/storage-handlers/hbase/pom.xml
@@ -24,7 +24,7 @@
org.apache.hcatalog
hcatalog
- 0.11.0-SNAPSHOT
+ 0.12.0-SNAPSHOT
../../pom.xml
@@ -32,7 +32,6 @@
org.apache.hcatalog
hbase-storage-handler
jar
- 0.11.0-SNAPSHOT
hbase-storage-handler
http://maven.apache.org
diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml
index 48e5a25..d794f9f 100644
--- a/hcatalog/webhcat/java-client/pom.xml
+++ b/hcatalog/webhcat/java-client/pom.xml
@@ -24,7 +24,7 @@
org.apache.hcatalog
hcatalog
- 0.11.0-SNAPSHOT
+ 0.12.0-SNAPSHOT
../../pom.xml
@@ -32,7 +32,6 @@
org.apache.hcatalog
webhcat-java-client
jar
- 0.11.0-SNAPSHOT
webhcat-java-client
http://maven.apache.org
diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml
index a0765fe..edbca90 100644
--- a/hcatalog/webhcat/svr/pom.xml
+++ b/hcatalog/webhcat/svr/pom.xml
@@ -24,7 +24,7 @@
org.apache.hcatalog
hcatalog
- 0.11.0-SNAPSHOT
+ 0.12.0-SNAPSHOT
../../pom.xml
@@ -32,7 +32,6 @@
org.apache.hcatalog
webhcat
jar
- 0.11.0-SNAPSHOT
webhcat
http://maven.apache.org
diff --git a/hwi/ivy.xml b/hwi/ivy.xml
index 68a67f1..81fa89b 100644
--- a/hwi/ivy.xml
+++ b/hwi/ivy.xml
@@ -31,8 +31,6 @@
-
diff --git a/ql/build.xml b/ql/build.xml
index 1f7eab2..fa7bd48 100644
--- a/ql/build.xml
+++ b/ql/build.xml
@@ -201,7 +201,7 @@
-
+
diff --git a/ql/ivy.xml b/ql/ivy.xml
index 51a3a38..ddd55b1 100644
--- a/ql/ivy.xml
+++ b/ql/ivy.xml
@@ -28,8 +28,6 @@
-