diff --git ant/ivy.xml ant/ivy.xml index 0fe0a23..e7c4cb7 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..c287350 100644 --- beeline/ivy.xml +++ beeline/ivy.xml @@ -15,41 +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 build-common.xml build-common.xml index eee4197..dc70f77 100644 --- build-common.xml +++ build-common.xml @@ -124,10 +124,8 @@ - - - + - - - - - - - - - - - - diff --git build.properties build.properties index 70b8a12..df119b2 100644 --- build.properties +++ build.properties @@ -72,13 +72,6 @@ jasperc.test.jar=${hadoop.root}/lib/jetty-ext/jasper-compiler.jar 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,testutils,hcatalog -iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog -iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,odbc,serde,service,hcatalog -iterate.hive.thrift=ql,service,metastore,serde -iterate.hive.protobuf=ql -iterate.hive.cpp=odbc # # Test Properties @@ -112,13 +105,13 @@ build.ivy.dir=${build.dir.hive}/ivy 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.conf.dir=${hive.root} +ivy.version=2.3.0 ivy.jar=${build.ivy.lib.dir}/ivy-${ivy.version}.jar ivy.changingPattern=.*SNAPSHOT ivy.publish.pattern=[artifact]-[revision].[ext] ivy.artifact.retrieve.pattern=[conf]/[artifact]-[revision](-[classifier]).[ext] -ivysettings.xml=${ivy.conf.dir}/ivysettings.xml +ivysettings.xml=${hive.root}/ivysettings.xml ivyresolvelog=default ivy.mvn.repo=http://repo2.maven.org/maven2 ivy_repo_url=${ivy.mvn.repo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar diff --git build.xml build.xml index c3594fa..c652516 100644 --- build.xml +++ build.xml @@ -18,7 +18,7 @@ --> - - + @@ -99,22 +99,24 @@ - - - - - - - + + - - + + + + + + + + + @@ -147,6 +149,12 @@ + + + + + + @@ -239,45 +264,45 @@ You must set thrift.home to the absolute path of your local Thrift installation. - + - + - + - + - + - + - + - + @@ -328,16 +353,16 @@ - + - - - + + @@ -504,19 +529,20 @@ - - - + + + - @@ -562,7 +588,7 @@ - + @@ -766,6 +792,7 @@ @@ -843,6 +870,7 @@ @@ -896,7 +924,9 @@ - + @@ -973,7 +1003,8 @@ - + @@ -1011,7 +1042,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 - + + + - - - - - - + + + + + conf="compile->default" /> diff --git common-configurations.xml common-configurations.xml new file mode 100644 index 0000000..a32127b --- /dev/null +++ common-configurations.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + diff --git common/ivy.xml common/ivy.xml index 95cee84..98ec1c9 100644 --- common/ivy.xml +++ common/ivy.xml @@ -15,34 +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 contrib/ivy.xml contrib/ivy.xml index 4216106..37b26df 100644 --- contrib/ivy.xml +++ contrib/ivy.xml @@ -14,19 +14,21 @@ 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 eclipse-templates/.classpath eclipse-templates/.classpath index 2400756..9e8801d 100644 --- eclipse-templates/.classpath +++ eclipse-templates/.classpath @@ -45,7 +45,6 @@ - @@ -66,7 +65,7 @@ - + @@ -87,6 +86,7 @@ + @@ -107,8 +107,22 @@ + diff --git hbase-handler/ivy.xml hbase-handler/ivy.xml index 7be8649..cc02cbd 100644 --- hbase-handler/ivy.xml +++ hbase-handler/ivy.xml @@ -15,31 +15,20 @@ 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..c2a04e3 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..ef301cd 100644 --- hwi/ivy.xml +++ hwi/ivy.xml @@ -14,25 +14,19 @@ 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..7161bdf 100644 --- ivy.xml +++ ivy.xml @@ -15,15 +15,15 @@ limitations under the License. --> - - + + Apache Hive - + @@ -34,21 +34,334 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git ivy/common-configurations.xml ivy/common-configurations.xml deleted file mode 100644 index 154b7cb..0000000 --- ivy/common-configurations.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git ivy/ivysettings.xml ivy/ivysettings.xml deleted file mode 100644 index d230f2c..0000000 --- ivy/ivysettings.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git ivy/libraries.properties ivy/libraries.properties deleted file mode 100644 index 6e25064..0000000 --- ivy/libraries.properties +++ /dev/null @@ -1,71 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This properties file lists the versions of the various artifacts used by Hive -# and components. -# -# It drives Ivy, the generation of a maven POM, and the generation of Eclipse -# project configuration files. - -# These are the versions of our dependencies (in alphabetical order) -apacheant.version=1.7.1 -ant-contrib.version=1.0b3 -ant-task.version=2.0.10 -antlr.version=3.4 -antlr-runtime.version=3.4 -asm.version=3.1 -avro.version=1.7.1 -datanucleus-connectionpool.version=2.0.3 -datanucleus-core.version=2.0.3 -datanucleus-enhancer.version=2.0.3 -datanucleus-rdbms.version=2.0.3 -checkstyle.version=5.0 -findbugs.version=1.3.9 -commons-cli.version=1.2 -commons-codec.version=1.4 -commons-collections.version=3.2.1 -commons-compress.version=1.4.1 -commons-configuration.version=1.6 -commons-dbcp.version=1.4 -commons-httpclient.version=3.0.1 -commons-io.version=2.4 -commons-lang.version=2.4 -commons-logging.version=1.0.4 -commons-logging-api.version=1.0.4 -commons-pool.version=1.5.4 -derby.version=10.4.2.0 -guava.version=11.0.2 -hbase.version=0.94.6.1 -jackson.version=1.8.8 -javaewah.version=0.3.2 -jdo-api.version=2.3-ec -jdom.version=1.1 -jetty.version=6.1.26 -jline.version=0.9.94 -json.version=20090211 -junit.version=4.10 -libfb303.version=0.9.0 -libthrift.version=0.9.0 -log4j.version=1.2.16 -maven-ant-tasks.version=2.1.0 -mockito-all.version=1.8.2 -protobuf.version=2.4.1 -rat.version=0.8 -slf4j-api.version=1.6.1 -slf4j-log4j12.version=1.6.1 -ST4.version=4.0.4 -tempus-fugit.version=1.1 -snappy.version=0.2 -velocity.version=1.5 -metrics-core.version=2.1.2 -zookeeper.version=3.4.3 -javolution.version=5.5.1 diff --git ivysettings.xml ivysettings.xml new file mode 100644 index 0000000..6be0d88 --- /dev/null +++ ivysettings.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git jdbc/ivy.xml jdbc/ivy.xml index 2bf78a6..9f63f2a 100644 --- jdbc/ivy.xml +++ jdbc/ivy.xml @@ -15,19 +15,21 @@ 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 libraries.properties libraries.properties new file mode 100644 index 0000000..f3313d9 --- /dev/null +++ libraries.properties @@ -0,0 +1,72 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This properties file lists the versions of the various artifacts used by Hive +# and components. +# +# It drives Ivy, the generation of a maven POM, and the generation of Eclipse +# project configuration files. + +# These are the versions of our dependencies (in alphabetical order) +apacheant.version=1.7.1 +ant-contrib.version=1.0b3 +ant-task.version=2.0.10 +antlr.version=3.4 +antlr-runtime.version=3.4 +asm.version=3.1 +avro.version=1.7.1 +datanucleus-connectionpool.version=2.0.3 +datanucleus-core.version=2.0.3 +datanucleus-enhancer.version=2.0.3 +datanucleus-rdbms.version=2.0.3 +checkstyle.version=5.0 +findbugs.version=1.3.9 +commons-cli.version=1.2 +commons-codec.version=1.4 +commons-collections.version=3.2.1 +commons-compress.version=1.4.1 +commons-configuration.version=1.6 +commons-dbcp.version=1.4 +commons-httpclient.version=3.0.1 +commons-io.version=2.4 +commons-lang.version=2.4 +commons-logging.version=1.0.4 +commons-logging-api.version=1.0.4 +commons-pool.version=1.5.4 +derby.version=10.4.2.0 +guava.version=11.0.2 +hbase.version=0.94.6.1 +high-scale-lib.version=1.1.1 +jackson.version=1.8.8 +javaewah.version=0.3.2 +jdo-api.version=2.3-ec +jdom.version=1.1 +jetty.version=6.1.26 +jline.version=0.9.94 +json.version=20090211 +junit.version=4.10 +libfb303.version=0.9.0 +libthrift.version=0.9.0 +log4j.version=1.2.16 +maven-ant-tasks.version=2.1.0 +mockito-all.version=1.8.2 +protobuf.version=2.4.1 +rat.version=0.8 +slf4j-api.version=1.6.1 +slf4j-log4j12.version=1.6.1 +ST4.version=4.0.4 +tempus-fugit.version=1.1 +snappy.version=0.2 +velocity.version=1.5 +metrics-core.version=2.1.2 +zookeeper.version=3.4.3 +javolution.version=5.5.1 diff --git metastore/ivy.xml metastore/ivy.xml index 6c1b37f..e6f8eb5 100644 --- metastore/ivy.xml +++ metastore/ivy.xml @@ -14,40 +14,17 @@ 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..11da501 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 serde/ivy.xml serde/ivy.xml index 94fa97e..d632886 100644 --- serde/ivy.xml +++ serde/ivy.xml @@ -15,33 +15,14 @@ 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..b87a297 100644 --- service/ivy.xml +++ service/ivy.xml @@ -15,21 +15,21 @@ 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..c9ff95e 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..222e946 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 - + + + - - - - -