diff --git build.xml build.xml index 1b18d70..0d8918d 100644 --- build.xml +++ build.xml @@ -26,11 +26,6 @@ - - - - - - - - - - + @@ -107,7 +94,7 @@ - + @@ -152,25 +139,30 @@ - - + + + + + + + - - - + @@ -183,26 +175,6 @@ - - - - - - - - - - - - @@ -332,7 +304,9 @@ + + diff --git hcatalog-pig-adapter/build.xml hcatalog-pig-adapter/build.xml index a6de0b3..355201b 100644 --- hcatalog-pig-adapter/build.xml +++ hcatalog-pig-adapter/build.xml @@ -19,23 +19,26 @@ - + - + - + - + - + + + + diff --git hcatalog-pig-adapter/ivy.xml hcatalog-pig-adapter/ivy.xml deleted file mode 100644 index f0341c5..0000000 --- hcatalog-pig-adapter/ivy.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Apache HCatalog - - - - - - - - - - - - - - - diff --git hcatalog-pig-adapter/pom.xml hcatalog-pig-adapter/pom.xml new file mode 100644 index 0000000..2b749a8 --- /dev/null +++ hcatalog-pig-adapter/pom.xml @@ -0,0 +1,65 @@ + + + + + + org.apache.hcatalog + hcatalog + ${hcatalog.version} + ../pom.xml + + + 4.0.0 + org.apache.hcatalog + hcatalog-pig-adapter + jar + ${hcatalog.version} + hcatalog-pig-adapter + http://maven.apache.org + + + + org.apache.hcatalog + hcatalog-core + ${hcatalog.version} + compile + + + org.apache.pig + pig + ${pig.version} + compile + + + + + junit + junit + ${junit.version} + test + + + org.apache.hadoop + hadoop-test + ${hadoop20.version} + test + + + diff --git pom.xml pom.xml index 5402176..52783ea 100644 --- pom.xml +++ pom.xml @@ -31,13 +31,11 @@ - - 4.0.0 - org.apache.hcatalog - hcatalog - ${hcatalog.version} - pom - + 4.0.0 + org.apache.hcatalog + hcatalog + ${hcatalog.version} + pom diff --git storage-handlers/hbase/build.xml storage-handlers/hbase/build.xml index 6e7d635..63824e8 100644 --- storage-handlers/hbase/build.xml +++ storage-handlers/hbase/build.xml @@ -74,20 +74,10 @@ - - - - - - - - - diff --git webhcat/java-client/build.xml webhcat/java-client/build.xml index c47db0f..0b06dbc 100644 --- webhcat/java-client/build.xml +++ webhcat/java-client/build.xml @@ -18,16 +18,16 @@ - + - + - + - + @@ -35,7 +35,10 @@ - + + + + diff --git webhcat/java-client/ivy.xml webhcat/java-client/ivy.xml deleted file mode 100644 index 7b048c5..0000000 --- webhcat/java-client/ivy.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - Apache HCatalog - - - - - - - - - - - - - - - - - diff --git webhcat/java-client/pom.xml webhcat/java-client/pom.xml new file mode 100644 index 0000000..82bba9a --- /dev/null +++ webhcat/java-client/pom.xml @@ -0,0 +1,53 @@ + + + + + + org.apache.hcatalog + hcatalog + ${hcatalog.version} + ../../pom.xml + + + 4.0.0 + org.apache.hcatalog + webhcat-java-client + jar + ${hcatalog.version} + webhcat-java-client + http://maven.apache.org + + + + org.apache.hcatalog + hcatalog-core + ${hcatalog.version} + compile + + + + + junit + junit + ${junit.version} + test + + + diff --git webhcat/svr/build.xml webhcat/svr/build.xml index ed7ecf0..7057dbd 100644 --- webhcat/svr/build.xml +++ webhcat/svr/build.xml @@ -18,23 +18,26 @@ - + - + - + - + - + + + + diff --git webhcat/svr/ivy.xml webhcat/svr/ivy.xml deleted file mode 100644 index 9a5e37f..0000000 --- webhcat/svr/ivy.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - Apache HCatalog - - - - - - - - - - - - - - - - - - - - diff --git webhcat/svr/pom.xml webhcat/svr/pom.xml new file mode 100644 index 0000000..1bf6ef2 --- /dev/null +++ webhcat/svr/pom.xml @@ -0,0 +1,77 @@ + + + + + + org.apache.hcatalog + hcatalog + ${hcatalog.version} + ../../pom.xml + + + 4.0.0 + org.apache.hcatalog + webhcat + jar + ${hcatalog.version} + webhcat + http://maven.apache.org + + + + org.apache.commons + commons-exec + ${commons-exec.version} + compile + + + org.apache.hcatalog + hcatalog-core + ${hcatalog.version} + compile + + + org.eclipse.jetty.aggregate + jetty-all-server + ${jetty.webhcat.version} + compile + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + compile + + + + + junit + junit + ${junit.version} + test + + + org.apache.hadoop + hadoop-test + ${hadoop20.version} + test + + +