diff --git ant/ivy.xml ant/ivy.xml index 0fe0a23..22ad2d6 100644 --- ant/ivy.xml +++ ant/ivy.xml @@ -14,19 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - - diff --git beeline/ivy.xml beeline/ivy.xml index cdded26..dc3879b 100644 --- beeline/ivy.xml +++ beeline/ivy.xml @@ -15,41 +15,15 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - - - - - - - - - - - - - - diff --git build-common.xml build-common.xml index 7f51c9f..b0cef09 100644 --- build-common.xml +++ build-common.xml @@ -124,10 +124,8 @@ - - - + - - - - - - - - - - - - diff --git build.properties build.properties index b3013a1..7f74f1a 100644 --- build.properties +++ build.properties @@ -73,9 +73,9 @@ 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,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.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils +iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils +iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,odbc,serde,service iterate.hive.thrift=ql,service,metastore,serde iterate.hive.protobuf=ql iterate.hive.cpp=odbc @@ -113,7 +113,7 @@ build.ivy.lib.dir=${build.ivy.dir}/lib build.ivy.report.dir=${build.ivy.dir}/report build.ivy.maven.dir=${build.ivy.dir}/maven ivy.conf.dir=${hive.root}/ivy -ivy.version=2.1.0 +ivy.version=2.3.0 ivy.jar=${build.ivy.lib.dir}/ivy-${ivy.version}.jar ivy.changingPattern=.*SNAPSHOT ivy.publish.pattern=[artifact]-[revision].[ext] diff --git build.xml build.xml index d43b1e2..786813c 100644 --- build.xml +++ build.xml @@ -511,12 +511,12 @@ - - - + + @@ -783,6 +783,7 @@ @@ -860,6 +861,7 @@ @@ -913,7 +915,9 @@ - + @@ -994,7 +998,8 @@ - + @@ -1032,7 +1037,8 @@ + useCacheOnly="${is-offline}" + log="${ivyresolvelog}"/> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - - - - - + + + + - - - - - - - diff --git cli/ivy.xml cli/ivy.xml index f7e86df..e7e298f 100644 --- cli/ivy.xml +++ cli/ivy.xml @@ -15,22 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - - - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - - - - - - - - - - - diff --git contrib/ivy.xml contrib/ivy.xml index 4216106..f3cc6d8 100644 --- contrib/ivy.xml +++ contrib/ivy.xml @@ -14,17 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - diff --git hbase-handler/ivy.xml hbase-handler/ivy.xml index a849ef2..21e5113 100644 --- hbase-handler/ivy.xml +++ hbase-handler/ivy.xml @@ -15,28 +15,12 @@ limitations under the License. --> - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + - - - - - - - - - - diff --git hcatalog/ivy.xml hcatalog/ivy.xml index b5e8ec5..7219eb6 100644 --- hcatalog/ivy.xml +++ hcatalog/ivy.xml @@ -18,17 +18,11 @@ --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - diff --git hwi/ivy.xml hwi/ivy.xml index 81fa89b..6c20894 100644 --- hwi/ivy.xml +++ hwi/ivy.xml @@ -14,25 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - - - - diff --git ivy.xml ivy.xml index e83437e..3db281c 100644 --- ivy.xml +++ ivy.xml @@ -15,15 +15,15 @@ limitations under the License. --> - - + + Apache Hive - + @@ -34,21 +34,334 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git ivy/ivysettings.xml ivy/ivysettings.xml index d230f2c..84d197b 100644 --- ivy/ivysettings.xml +++ ivy/ivysettings.xml @@ -30,12 +30,13 @@ http://www.ibiblio.net/pub/packages/maven2 --> + + - @@ -51,11 +52,7 @@ - - - - - + @@ -63,20 +60,19 @@ - + + - - + - @@ -91,16 +87,5 @@ - - - - - + diff --git ivy/libraries.properties ivy/libraries.properties index 6c92dcc..1516194 100644 --- ivy/libraries.properties +++ ivy/libraries.properties @@ -45,6 +45,7 @@ commons-pool.version=1.5.4 derby.version=10.4.2.0 guava.version=11.0.2 hbase.version=0.92.0 +high-scale-lib.version=1.1.1 jackson.version=1.8.8 javaewah.version=0.3.2 jdo-api.version=2.3-ec diff --git jdbc/ivy.xml jdbc/ivy.xml index 2bf78a6..bcb45a8 100644 --- jdbc/ivy.xml +++ jdbc/ivy.xml @@ -15,17 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - diff --git metastore/ivy.xml metastore/ivy.xml index 6c1b37f..a0190b8 100644 --- metastore/ivy.xml +++ metastore/ivy.xml @@ -14,40 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - - - - - - - - - - - - - - - - diff --git odbc/ivy.xml odbc/ivy.xml index be556ab..9098ee2 100644 --- odbc/ivy.xml +++ odbc/ivy.xml @@ -15,17 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - - - - - - - - diff --git ql/ivy.xml ql/ivy.xml index ddd55b1..844a275 100644 --- ql/ivy.xml +++ ql/ivy.xml @@ -15,16 +15,10 @@ limitations under the License. --> - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + - - - @@ -34,46 +28,5 @@ conf="test->default" transitive="false"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git serde/ivy.xml serde/ivy.xml index 94fa97e..08466be 100644 --- serde/ivy.xml +++ serde/ivy.xml @@ -15,33 +15,12 @@ limitations under the License. --> - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + - - - - - - - - - - - - - diff --git service/ivy.xml service/ivy.xml index 0ff53cc..8aa30a3 100644 --- service/ivy.xml +++ service/ivy.xml @@ -15,21 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - - diff --git shims/ivy.xml shims/ivy.xml index 04ef641..49cfbb5 100644 --- shims/ivy.xml +++ shims/ivy.xml @@ -16,159 +16,10 @@ limitations under the License. --> - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git testutils/ivy.xml testutils/ivy.xml index 10690c1..1696fe1 100644 --- testutils/ivy.xml +++ testutils/ivy.xml @@ -15,20 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage. - https://cwiki.apache.org/confluence/display/Hive/Home - + + + - - - - -