hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1521143 - in /hive/trunk: build.properties build.xml hcatalog/build.xml
Date Mon, 09 Sep 2013 14:41:28 GMT
Author: hashutosh
Date: Mon Sep  9 14:41:28 2013
New Revision: 1521143

URL: http://svn.apache.org/r1521143
Log:
HIVE-4871 : Apache builds fail with Target make-pom does not exist in the project hcatalog
(Eugene Koifman via Ashutosh Chauhan)

Modified:
    hive/trunk/build.properties
    hive/trunk/build.xml
    hive/trunk/hcatalog/build.xml

Modified: hive/trunk/build.properties
URL: http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1521143&r1=1521142&r2=1521143&view=diff
==============================================================================
--- hive/trunk/build.properties (original)
+++ hive/trunk/build.properties Mon Sep  9 14:41:28 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/trunk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1521143&r1=1521142&r2=1521143&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Mon Sep  9 14:41:28 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>
@@ -1135,8 +1135,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"
@@ -1165,9 +1163,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" />
@@ -1217,8 +1213,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"
@@ -1279,9 +1274,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">
@@ -1290,6 +1282,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">
@@ -1415,16 +1429,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/trunk/hcatalog/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/build.xml?rev=1521143&r1=1521142&r2=1521143&view=diff
==============================================================================
--- hive/trunk/hcatalog/build.xml (original)
+++ hive/trunk/hcatalog/build.xml Mon Sep  9 14:41:28 2013
@@ -515,5 +515,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>



Mime
View raw message