diff --git ant/build.xml ant/build.xml index 17b3c3a..180ed36 100644 --- ant/build.xml +++ ant/build.xml @@ -27,10 +27,16 @@ to call at top-level: ant deploy-contrib compile-core-test - + + + + + + + - + + diff --git ant/ivy.xml ant/ivy.xml index 5c6299b..e3b0c1c 100644 --- ant/ivy.xml +++ ant/ivy.xml @@ -1,3 +1,19 @@ + diff --git build-common.xml build-common.xml index 6bf5d3c..ac38160 100644 --- build-common.xml +++ build-common.xml @@ -48,8 +48,8 @@ - - + + @@ -59,15 +59,6 @@ - - - - - - - - - @@ -108,6 +99,7 @@ + @@ -115,6 +107,7 @@ + @@ -122,6 +115,7 @@ + @@ -130,6 +124,7 @@ Also note how we skip loading Ivy if it is already there, just to make sure all is well. --> + @@ -152,6 +147,7 @@ + @@ -159,24 +155,28 @@ + + + + @@ -185,12 +185,14 @@ + + @@ -202,16 +204,19 @@ + + + @@ -220,21 +225,40 @@ - - + + + + + + + + + + + + + + + + + + + + - + + @@ -243,11 +267,29 @@ - - + + + + + + + + + + + + + + + + + + + @@ -258,9 +300,12 @@ - + + + + @@ -270,10 +315,12 @@ - + + + - + - + @@ -304,6 +351,7 @@ + + @@ -342,6 +391,7 @@ + @@ -378,12 +428,14 @@ + + @@ -393,7 +445,9 @@ - + + + @@ -407,10 +461,17 @@ - - - + + + + + + + + + + + @@ -437,12 +498,12 @@ - + + includes="${test.includes}" + excludes="${test.excludes}" /> @@ -453,26 +514,21 @@ Tests failed! - - - - - - - + - + + diff --git build.xml build.xml index 02132b8..343e6f7 100644 --- build.xml +++ build.xml @@ -135,39 +135,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -202,9 +173,6 @@ - - - @@ -633,7 +601,6 @@ - + diff --git cli/ivy.xml cli/ivy.xml index 86ad1ee..bd6ad29 100644 --- cli/ivy.xml +++ cli/ivy.xml @@ -1,3 +1,19 @@ + diff --git common/build.xml common/build.xml index d9ac07e..aadb231 100755 --- common/build.xml +++ common/build.xml @@ -28,6 +28,7 @@ to call at top-level: ant deploy-contrib compile-core-test + diff --git common/ivy.xml common/ivy.xml index 7c8cb75..3d0eb0b 100644 --- common/ivy.xml +++ common/ivy.xml @@ -1,3 +1,19 @@ + diff --git contrib/build.xml contrib/build.xml index 67948ca..d803c7f 100644 --- contrib/build.xml +++ contrib/build.xml @@ -48,6 +48,7 @@ + @@ -56,6 +57,7 @@ + @@ -110,7 +112,7 @@ - + diff --git contrib/ivy.xml contrib/ivy.xml index 899ca70..83df844 100644 --- contrib/ivy.xml +++ contrib/ivy.xml @@ -1,3 +1,19 @@ + diff --git hbase-handler/build.xml hbase-handler/build.xml index 88c227a..ad93976 100644 --- hbase-handler/build.xml +++ hbase-handler/build.xml @@ -52,6 +52,7 @@ + @@ -60,6 +61,7 @@ + @@ -88,7 +90,7 @@ - + diff --git hbase-handler/ivy.xml hbase-handler/ivy.xml index 899ca70..83df844 100644 --- hbase-handler/ivy.xml +++ hbase-handler/ivy.xml @@ -1,3 +1,19 @@ + diff --git hwi/build.xml hwi/build.xml index 76bffa8..45a6c7f 100644 --- hwi/build.xml +++ hwi/build.xml @@ -44,6 +44,7 @@ + - + diff --git ivy.xml ivy.xml index d3ed592..7e4c914 100644 --- ivy.xml +++ ivy.xml @@ -39,6 +39,8 @@ conf="checkstyle->default"/> + diff --git ivy/libraries.properties ivy/libraries.properties index 0ede62a..af3c3d4 100644 --- ivy/libraries.properties +++ ivy/libraries.properties @@ -49,3 +49,4 @@ thrift.version=0.5.0 thrift-fb303.version=0.5.0 zookeeper.version=3.3.1 guava.version=r06 +velocity.version=1.5 diff --git jdbc/build.xml jdbc/build.xml index 9d9a59e..179c7d1 100644 --- jdbc/build.xml +++ jdbc/build.xml @@ -19,44 +19,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git jdbc/ivy.xml jdbc/ivy.xml new file mode 100644 index 0000000..7e4088e --- /dev/null +++ jdbc/ivy.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git metastore/build.xml metastore/build.xml index 7f01f91..6d86fae 100755 --- metastore/build.xml +++ metastore/build.xml @@ -23,6 +23,7 @@ + You must set the 'thrift.home' property! Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/hive_metastore.thrift @@ -36,7 +37,7 @@ - Building Grammar ${src.dir}/java/org/apache/hadoop/hive/metastore/parser/Filter.g .... + @@ -45,11 +46,12 @@ + - + + + @@ -79,6 +83,7 @@ + @@ -96,8 +101,9 @@ + - + + diff --git odbc/build.xml odbc/build.xml index db9f4af..9c6b340 100644 --- odbc/build.xml +++ odbc/build.xml @@ -41,12 +41,14 @@ + + @@ -60,6 +62,7 @@ + @@ -69,6 +72,7 @@ + @@ -79,6 +83,7 @@ + @@ -88,6 +93,7 @@ + diff --git ql/build.xml ql/build.xml index 50c604e..15a767e 100644 --- ql/build.xml +++ ql/build.xml @@ -55,6 +55,7 @@ + You must set the 'thrift.home' property! Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/queryplan.thrift @@ -63,6 +64,7 @@ + @@ -136,6 +138,7 @@ + Building Grammar ${src.dir}/org/apache/hadoop/hive/ql/parse/Hive.g .... @@ -145,11 +148,12 @@ + - + - + @@ -206,7 +210,7 @@ - + diff --git ql/ivy.xml ql/ivy.xml index c25fa51..4e50079 100644 --- ql/ivy.xml +++ ql/ivy.xml @@ -1,3 +1,19 @@ + diff --git serde/build.xml serde/build.xml index 51ac8dd..523c3e4 100644 --- serde/build.xml +++ serde/build.xml @@ -29,7 +29,7 @@ to call at top-level: ant deploy-contrib compile-core-test - + - + + You must set the 'thrift.home' property! Executing ${thrift.home}/bin/thrift to build java serde Constants... @@ -72,14 +73,14 @@ to call at top-level: ant deploy-contrib compile-core-test - Generating data/files/complex.seq... + - + diff --git service/build.xml service/build.xml index 3c54625..5ff4675 100644 --- service/build.xml +++ service/build.xml @@ -41,6 +41,7 @@ + You must set the 'thrift.home' property! Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/hive_service.thrift @@ -49,6 +50,7 @@ + + - + + diff --git service/ivy.xml service/ivy.xml new file mode 100644 index 0000000..c87df10 --- /dev/null +++ service/ivy.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git shims/build.xml shims/build.xml index 2021cfb..851f7b0 100644 --- shims/build.xml +++ shims/build.xml @@ -26,22 +26,17 @@ to call at top-level: ant deploy-contrib compile-core-test - - - - - - - - - - - - + + + + + - + - + + - + @@ -79,8 +75,9 @@ to call at top-level: ant deploy-contrib compile-core-test - + + - + + + + + + + + + + + + diff --git shims/ivy.xml shims/ivy.xml index 82b6688..3927713 100644 --- shims/ivy.xml +++ shims/ivy.xml @@ -1,3 +1,19 @@ +