diff --git ant/dependencies.xml ant/dependencies.xml new file mode 100644 index 0000000..efad6cb --- /dev/null +++ ant/dependencies.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git ant/deploy.xml ant/deploy.xml new file mode 100644 index 0000000..fcdc49f --- /dev/null +++ ant/deploy.xml @@ -0,0 +1,84 @@ + + + + + + + + + + Signing @{inputFile} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_install jarFile="${build.dir}/hcatalog/hcatalog-${hcatalog.version}.jar" + pomFile="${build.ivy.dir}/hcatalog-${hcatalog.version}.pom"/> + <_install jarFile="${build.dir}/hcatalog/hcatalog-core-${hcatalog.version}.jar" + pomFile="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"/> + <_install jarFile="${build.dir}/hcatalog/hcatalog-server-extensions-${hcatalog.version}.jar" + pomFile="${build.ivy.dir}/hcatalog-server-extensions-${hcatalog.version}.pom"/> + <_install jarFile="${basedir}/hcatalog-pig-adapter/build/hcatalog-pig-adapter-${hcatalog.version}.jar" + pomFile="hcatalog-pig-adapter/build/ivy/hcatalog-pig-adapter-${hcatalog.version}.pom"/> + + + \ No newline at end of file diff --git build-common-new.xml build-common-new.xml index e0cf142..287209f 100644 --- build-common-new.xml +++ build-common-new.xml @@ -17,7 +17,9 @@ limitations under the License. --> - + @@ -30,6 +32,10 @@ + + + + + + + + @@ -84,28 +94,6 @@ - - - - - - - - - - - - - - - - <_javac srcDir="${basedir}/src/main/java" @@ -121,10 +109,12 @@ <_junit/> - + - + + + @@ -138,6 +128,4 @@ jarDir="${build.dir}" classPathRef="findbugs.class.path"/> - - diff --git build-common.xml build-common.xml index 16f65fc..24e47e9 100644 --- build-common.xml +++ build-common.xml @@ -1,6 +1,10 @@ + + + + @@ -27,20 +31,4 @@ - - - - - - - - diff --git build.xml build.xml index 8ef2035..4c96fd3 100644 --- build.xml +++ build.xml @@ -18,7 +18,9 @@ --> - + - - - - - - + + + + - - - - - - - - - - - - - - - - + + - - + + - + + - - - - - - - - - - - - + + + + + - - - - - + + - - - - - - - You need Apache Ivy 2.0 or later from http://ant.apache.org/ - It could not be loaded from ${ivy_repo_url} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + @@ -277,7 +199,7 @@ source="${javac.version}" deprecation="${javac.deprecation}" includeantruntime="false"> - + - - - + @@ -341,16 +267,20 @@ --> - - - - - + @@ -473,10 +403,6 @@ - - - - <_findbugs outputDir="${findbugs.out.dir}" outputFile="${findbugs.report.xmlfile}" excludeFilter="${findbugs.exclude.file}" @@ -484,7 +410,7 @@ findbugsReportHtmlFile="${findbugs.report.htmlfile}" sourceDir="${src.dir}" jarDir="${build.dir}/${ant.project.name}" - classPathRef="findbugs.class.path"/> + classPathRef="compile.classpath"/> @@ -534,7 +460,7 @@ failonerror="true"> - + @@ -642,7 +568,7 @@ - + @@ -710,6 +636,8 @@ + + diff --git hcatalog-pig-adapter/build.xml hcatalog-pig-adapter/build.xml index a281a0b..0b4f2d0 100644 --- hcatalog-pig-adapter/build.xml +++ hcatalog-pig-adapter/build.xml @@ -21,25 +21,23 @@ - - + + + - - + + + - - - - + + diff --git hcatalog-pig-adapter/ivy.xml hcatalog-pig-adapter/ivy.xml index 6b6cb8d..fc39d04 100644 --- hcatalog-pig-adapter/ivy.xml +++ hcatalog-pig-adapter/ivy.xml @@ -26,19 +26,16 @@ - + - - - + - - - - + + + diff --git ivy.xml ivy.xml index cf4b7d2..729f8db 100644 --- ivy.xml +++ ivy.xml @@ -1,137 +1,72 @@ - + - - - - - Apache HCatalog - - + + + + Apache HCatalog + + + + + + - - - - - - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git ivy/libraries.properties ivy/libraries.properties index 0290dc3..582d026 100644 --- ivy/libraries.properties +++ ivy/libraries.properties @@ -44,8 +44,8 @@ jetty.version=6.1.26 jms.version=1.1 junit.version=4.10 log4j.version=1.2.16 +maven-ant-tasks.version=2.1.3 pig.version=0.8.0 rats-lib.version=0.5.1 slf4j.version=1.6.1 -zookeeper.version=3.4.3 - +zookeeper.version=3.4.3 \ No newline at end of file diff --git storage-handlers/build.xml storage-handlers/build.xml index 6777ce8..484989a 100644 --- storage-handlers/build.xml +++ storage-handlers/build.xml @@ -28,6 +28,11 @@ + + + + + Generating all handlers diff --git storage-handlers/hbase/build.xml storage-handlers/hbase/build.xml index 8a2420a..0d1a32a 100644 --- storage-handlers/hbase/build.xml +++ storage-handlers/hbase/build.xml @@ -88,10 +88,10 @@ value="${mvnrepo}/org/apache/maven/maven-ant-tasks/${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/> + - - + @@ -99,92 +99,22 @@ - - - - - + + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - You need Apache Ivy 2.0 or later from http://ant.apache.org/ - It could not be loaded from ${ivy_repo_url} - - - - - - - - - - - - - - - - - - - - - - - - + @@ -202,7 +132,7 @@ source="${javac.version}" deprecation="${javac.deprecation}" includeantruntime="false"> - + @@ -293,15 +223,21 @@ - - - - - - - - + + + + + + + @@ -343,4 +279,7 @@ + + + diff --git storage-handlers/hbase/ivy.xml storage-handlers/hbase/ivy.xml index d624ef9..a7b76d2 100644 --- storage-handlers/hbase/ivy.xml +++ storage-handlers/hbase/ivy.xml @@ -15,109 +15,34 @@ limitations under the License. --> - - - - - Apache HCatalog - - + + + + Apache HCatalog + - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + +