You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2013/10/07 22:37:06 UTC
svn commit: r1530053 - in /hive/branches/branch-0.12: build.properties
build.xml hcatalog/build.xml
Author: thejas
Date: Mon Oct 7 20:37:06 2013
New Revision: 1530053
URL: http://svn.apache.org/r1530053
Log:
HIVE-4871 : Apache builds fail with Target "make-pom" does not exist in the project "hcatalog". (Eugene Koifman via Ashutosh Chauhan)
Modified:
hive/branches/branch-0.12/build.properties
hive/branches/branch-0.12/build.xml
hive/branches/branch-0.12/hcatalog/build.xml
Modified: hive/branches/branch-0.12/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/build.properties?rev=1530053&r1=1530052&r2=1530053&view=diff
==============================================================================
--- hive/branches/branch-0.12/build.properties (original)
+++ hive/branches/branch-0.12/build.properties Mon Oct 7 20:37:06 2013
@@ -147,6 +147,8 @@ mvn.pom.dir=${build.dir.hive}/maven/poms
mvn.license.dir=${build.dir.hive}/maven/licenses
mvn.deploy.id=apache.snapshots.https
mvn.deploy.url=https://repository.apache.org/content/repositories/snapshots
+mvn.staging.repo.id=apache.staging.https
+mvn.staging.repo.url=https://repository.apache.org/service/local/staging/deploy/maven2
#
# Data nucleus repository - needed for jdo2-api-2.3-ec.jar download
Modified: hive/branches/branch-0.12/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/build.xml?rev=1530053&r1=1530052&r2=1530053&view=diff
==============================================================================
--- hive/branches/branch-0.12/build.xml (original)
+++ hive/branches/branch-0.12/build.xml Mon Oct 7 20:37:06 2013
@@ -239,7 +239,7 @@
-->
<target name="ivy-init-antlib" depends="ivy-download,ivy-init-dirs,ivy-probe-antlib" unless="ivy.found">
<echo message="Project: ${ant.project.name}"/>
- <typedef uri="antlib:org.apache.ivy.ant" onerror="fail" loaderRef="ivyLoader">
+ <typedef uri="antlib:org.apache.ivy.ant" onerror="fail" loaderRef="ivyLoader" resource="org/apache/ivy/ant/antlib.xml">
<classpath>
<pathelement location="${ivy.jar}"/>
</classpath>
@@ -1136,8 +1136,6 @@
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/metastore/hive-metastore-${version}.jar"
todir="${mvn.jar.dir}" />
- <copy file="${build.dir.hive}/hcatalog/hive-hcatalog-${hcatalog.version}.jar"
- todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/ql/hive-exec-${version}.jar"
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/serde/hive-serde-${version}.jar"
@@ -1166,9 +1164,7 @@
tofile="${mvn.pom.dir}/hive-jdbc-${version}.pom" />
<copy file="${build.dir.hive}/metastore/pom.xml"
tofile="${mvn.pom.dir}/hive-metastore-${version}.pom" />
- <copy file="${build.dir.hive}/hcatalog/pom.xml"
- tofile="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.pom" />
- <copy file="${build.dir.hive}/ql/pom.xml"
+ <copy file="${build.dir.hive}/ql/pom.xml"
tofile="${mvn.pom.dir}/hive-exec-${version}.pom" />
<copy file="${build.dir.hive}/serde/pom.xml"
tofile="${mvn.pom.dir}/hive-serde-${version}.pom" />
@@ -1218,8 +1214,7 @@
file="${mvn.jar.dir}/hive-${hive.project}-${version}.jar">
<pom refid="hive.project.pom" />
<remoteRepository
- id="apache.staging.https"
- url="https://repository.apache.org/service/local/staging/deploy/maven2" />
+ id="${mvn.staging.repo.id}" url="${mvn.staging.repo.url}"/>
<attach file="${mvn.jar.dir}/hive-${hive.project}-${version}.jar.asc"
type="jar.asc"/>
<attach file="${mvn.pom.dir}/hive-${hive.project}-${version}.pom.asc"
@@ -1280,9 +1275,6 @@
<param name="hive.project" value="metastore" />
</antcall>
<antcall target="maven-publish-artifact">
- <param name="hive.project" value="hcatalog" />
- </antcall>
- <antcall target="maven-publish-artifact">
<param name="hive.project" value="serde" />
</antcall>
<antcall target="maven-publish-artifact">
@@ -1291,6 +1283,28 @@
<antcall target="maven-publish-artifact">
<param name="hive.project" value="shims" />
</antcall>
+ <!-- Handle HCat separately; matches maven-publish-artifact-->
+ <if>
+ <equals arg1="${mvn.publish.repo}" arg2="staging" />
+ <then>
+ <ant dir="hcatalog" target="mvn-deploy-signed">
+ <property name="mvn.deploy.repo.id" value="${mvn.staging.repo.id}"/>
+ <property name="mvn.deploy.repo.url" value="${mvn.staging.repo.url}"/>
+ </ant>
+ </then>
+ <elseif>
+ <equals arg1="${mvn.publish.repo}" arg2="local"/>
+ <then>
+ <!-- NOP, HCat always publishes to the local repo in jar target-->
+ </then>
+ </elseif>
+ <else>
+ <ant dir="hcatalog" target="mvn-deploy">
+ <property name="mvn.deploy.repo.id" value="${mvn.deploy.id}"/>
+ <property name="mvn.deploy.repo.url" value="${mvn.deploy.url}"/>
+ </ant>
+ </else>
+ </if>
</target>
<target name="maven-sign" if="staging">
@@ -1416,16 +1430,6 @@
output.file="${mvn.jar.dir}/hive-metastore-${version}.pom.asc"
gpg.passphrase="${gpg.passphrase}"/>
- <!-- hive-hcatalog -->
- <sign-artifact
- input.file="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.jar"
- output.file="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.jar.asc"
- gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact
- input.file="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.pom"
- output.file="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.pom.asc"
- gpg.passphrase="${gpg.passphrase}"/>
-
<!-- hive-serde -->
<sign-artifact
input.file="${mvn.jar.dir}/hive-serde-${version}.jar"
Modified: hive/branches/branch-0.12/hcatalog/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/hcatalog/build.xml?rev=1530053&r1=1530052&r2=1530053&view=diff
==============================================================================
--- hive/branches/branch-0.12/hcatalog/build.xml (original)
+++ hive/branches/branch-0.12/hcatalog/build.xml Mon Oct 7 20:37:06 2013
@@ -516,5 +516,6 @@
<import file="build-support/ant/deploy.xml"/>
<import file="build-support/ant/findbugs.xml"/>
<import file="build-support/ant/test.xml"/>
-
+
+ <target name="make-pom" description="no-op in hcatalog, here to make hive's build work"/>
</project>