Return-Path: 
 <commits-return-3536-apmail-zookeeper-commits-archive=zookeeper.apache.org@zookeeper.apache.org>
X-Original-To: apmail-zookeeper-commits-archive@www.apache.org
Delivered-To: apmail-zookeeper-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 708E910D84
	for <apmail-zookeeper-commits-archive@www.apache.org>;
 Fri, 20 Dec 2013 01:29:44 +0000 (UTC)
Received: (qmail 57077 invoked by uid 500); 20 Dec 2013 01:29:44 -0000
Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org
Received: (qmail 57055 invoked by uid 500); 20 Dec 2013 01:29:44 -0000
Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zookeeper.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zookeeper.apache.org>
List-Post: <mailto:commits@zookeeper.apache.org>
List-Id: <commits.zookeeper.apache.org>
Reply-To: dev@<zookeeper.apache.org>
Delivered-To: mailing list commits@zookeeper.apache.org
Received: (qmail 57047 invoked by uid 99); 20 Dec 2013 01:29:44 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Dec 2013 01:29:44 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Dec 2013 01:29:42 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9090D2388993;
	Fri, 20 Dec 2013 01:29:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1552470 - in /zookeeper/branches/branch-3.4: CHANGES.txt
 build.xml ivy.xml
Date: Fri, 20 Dec 2013 01:29:22 -0000
To: commits@zookeeper.apache.org
From: phunt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131220012922.9090D2388993@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: phunt
Date: Fri Dec 20 01:29:22 2013
New Revision: 1552470

URL: http://svn.apache.org/r1552470
Log:
ZOOKEEPER-1430. add maven deploy support to the build (Giridharan Kesavan via phunt)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/build.xml
    zookeeper/branches/branch-3.4/ivy.xml

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1552470&r1=1552469&r2=1552470&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Fri Dec 20 01:29:22 2013
@@ -244,6 +244,9 @@ IMPROVEMENTS:
 
   ZOOKEEPER-1715. Upgrade netty version (Sean Bridges via michim)
 
+  ZOOKEEPER-1430. add maven deploy support to the build
+  (Giridharan Kesavan via phunt)
+
 Release 3.4.5 - 2012-09-30
 
 Backward compatible changes:

Modified: zookeeper/branches/branch-3.4/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/build.xml?rev=1552470&r1=1552469&r2=1552470&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/build.xml (original)
+++ zookeeper/branches/branch-3.4/build.xml Fri Dec 20 01:29:22 2013
@@ -22,12 +22,15 @@ xmlns:ivy="antlib:org.apache.ivy.ant"
 xmlns:artifact="antlib:org.apache.maven.artifact.ant"
 xmlns:maven="antlib:org.apache.maven.artifact.ant">
 
+    <!-- read build.properties from the basedir if any -->
+    <property file="${basedir}/build.properties" />
+
     <property name="Name" value="ZooKeeper" />
     <property name="name" value="zookeeper" />
 
     <property environment="env"/>
     
-    <property name="version" value="3.4.5" />
+    <property name="version" value="3.4.6-SNAPSHOT" />
     <property name="final.name" value="${name}-${version}"/>
     <property name="revision.dir" value="${basedir}/.revision" />
     <property name="revision.properties" value="revision.properties" />
@@ -177,6 +180,24 @@ xmlns:maven="antlib:org.apache.maven.art
     <property name="package.buildroot" value="/tmp/zookeeper_package_build_${user.name}"/>
     <property name="package.build.dir" value="/tmp/zookeeper_package_build_${user.name}/BUILD"/>
 
+    <!-- artifact publishing property set -->
+    <property name="staging_repo_id" value="apache.staging.https"/>
+    <property name="wagon-http.version" value="2.4"/>
+    <property name="snapshots_repo_id" value="apache.snapshots.https"/>
+    <property name="asfrepo" value="https://repository.apache.org"/> 
+    <property name="snapshots_repo_url" 
+      value="${asfrepo}/content/repositories/snapshots"/> 
+    <property name="staging_repo_url"
+      value="${asfrepo}/service/local/staging/deploy/maven2"/> 
+    <property name="gpg-plugin" 
+      value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file"/>
+    <property name="deploy-plugin" 
+      value="org.apache.maven.plugins:maven-deploy-plugin:2.8.1:deploy-file"/>
+    <property name="main-jar" value="${dist.maven.dir}/${final.name}.jar"/>
+    <property name="tests-jar" value="${dist.maven.dir}/${final.name}-tests.jar"/>
+    <property name="sources-jar" value="${dist.maven.dir}/${final.name}-sources.jar"/>
+    <property name="javadoc-jar" value="${dist.maven.dir}/${final.name}-javadoc.jar"/>
+
     <!-- ====================================================== -->
     <!-- Macro definitions                                      -->
     <!-- ====================================================== -->
@@ -365,6 +386,11 @@ xmlns:maven="antlib:org.apache.maven.art
       <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
     </target>
 
+    <target name="ivy-retrieve-mvn-ant-task" depends="init,ivy-init">
+      <ivy:retrieve settingsRef="${ant.project.name}" conf="mvn-ant-task"
+                    pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+      <ivy:cachepath pathid="mvn-ant-task-classpath" conf="mvn-ant-task"/>
+    </target>
     <target name="compile" depends="ivy-retrieve,clover,build-generated">
         <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
                target="${javac.target}" source="${javac.source}" debug="on">
@@ -688,7 +714,7 @@ xmlns:maven="antlib:org.apache.maven.art
         <fileset file="${build.dir}/${final.name}-sources.jar"/>
         <fileset file="${build.dir}/${final.name}-javadoc.jar"/>
       </copy>
-      
+
       <checksum file="${dist.maven.dir}/${final.name}.jar" algorithm="md5"/>
       <checksum file="${dist.maven.dir}/${final.name}.jar" algorithm="sha1"/>
       <checksum file="${dist.maven.dir}/${final.name}-sources.jar" algorithm="md5"/>
@@ -703,7 +729,7 @@ xmlns:maven="antlib:org.apache.maven.art
       </ivy:makepom>
       <checksum file="${dist.maven.dir}/${final.name}.pom" algorithm="md5"/>
       <checksum file="${dist.maven.dir}/${final.name}.pom" algorithm="sha1"/>
-      
+
       <copy file="${build.dir}/${final.name}-test.jar"
             tofile="${dist.maven.dir}/${final.name}-tests.jar"/> 
       <checksum file="${dist.maven.dir}/${final.name}-tests.jar" algorithm="sha1"/>
@@ -776,7 +802,7 @@ xmlns:maven="antlib:org.apache.maven.art
         <property name="package.share" value="/share/zookeeper"/>
         <fileset file="${contrib.dir}/build.xml"/>
         <fileset file="${recipes.dir}/build.xml"/>
-      </subant>  	
+      </subant>
 
       <copy todir="${dist.dir}/share/zookeeper"> 
         <fileset file="${build.dir}/${final.name}.jar"/>
@@ -802,26 +828,18 @@ xmlns:maven="antlib:org.apache.maven.art
       <checksum file="${dist.maven.dir}/${final.name}-javadoc.jar" algorithm="sha1"/>
 
       <ivy:makepom settingsRef="${ant.project.name}" ivyfile="${basedir}/ivy.xml"
-                   pomfile="${dist.maven.dir}/${final.name}.pom">
+                   pomfile="${dist.maven.dir}/${name}.pom">
         <mapping conf="default" scope="compile"/>
         <mapping conf="test" scope="test"/>
       </ivy:makepom>
-      <checksum file="${dist.maven.dir}/${final.name}.pom" algorithm="md5"/>
-      <checksum file="${dist.maven.dir}/${final.name}.pom" algorithm="sha1"/>
+      <checksum file="${dist.maven.dir}/${name}.pom" algorithm="md5"/>
+      <checksum file="${dist.maven.dir}/${name}.pom" algorithm="sha1"/>
       
       
       <copy file="${build.dir}/${final.name}-test.jar"
-            tofile="${dist.maven.dir}/${final.name}-test.jar"/> 
-      <checksum file="${dist.maven.dir}/${final.name}-test.jar" algorithm="sha1"/>
-      <checksum file="${dist.maven.dir}/${final.name}-test.jar" algorithm="md5"/>
-      <ivy:makepom settingsRef="${ant.project.name}" ivyfile="${basedir}/ivy.xml"
-                   pomfile="${dist.maven.dir}/${final.name}-test.pom"
-		   artifactName="zookeeper-test">
-        <mapping conf="default" scope="compile"/>
-        <mapping conf="test" scope="test"/>
-      </ivy:makepom>
-      <checksum file="${dist.maven.dir}/${final.name}-test.pom" algorithm="md5"/>
-      <checksum file="${dist.maven.dir}/${final.name}-test.pom" algorithm="sha1"/>
+            tofile="${dist.maven.dir}/${final.name}-tests.jar"/>
+      <checksum file="${dist.maven.dir}/${final.name}-tests.jar" algorithm="sha1"/>
+      <checksum file="${dist.maven.dir}/${final.name}-tests.jar" algorithm="md5"/>
 
 
       <copy todir="${dist.dir}/bin">
@@ -1095,30 +1113,64 @@ xmlns:maven="antlib:org.apache.maven.art
       <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
 
     </target>
-    
+
+    <!-- ====================================================== -->
+    <!-- mvn-deploy. Publishing jars to nexus -->
+    <!-- ====================================================== -->
+
+    <macrodef name="deploy" description="macro definition for publishing artifacts to nexus snapshots">
+      <attribute name="jars" default="${tests-jar},${sources-jar},${javadoc-jar}"/>
+      <attribute name="maven-jar" default="${main-jar}"/>
+      <attribute name="repo-url" default="${snapshots_repo_url}"/>
+      <attribute name="repo-id" default="${snapshots_repo_id}"/>
+      <attribute name="profile" default="-P!gpg"/>
+      <attribute name="plugin" default="${deploy-plugin}"/>
+      <attribute name="attachas" default="tests,sources,javadoc"/>
+      <sequential>
+	<artifact:mvn>
+	  <arg value="@{plugin}"/>
+	  <arg value="-Durl=@{repo-url}"/>
+	  <arg value="-DrepositoryId=@{repo-id}"/>
+	  <arg value="-Dfiles=@{jars}"/>
+	  <arg value="-Dfile=@{maven-jar}"/>
+	  <arg value="-Dpackaging=jar"/>
+	  <arg value="-DpomFile=${dist.maven.dir}/${name}.pom"/>
+	  <arg value="-Dclassifiers=@{attachas}"/>
+	  <arg value="-Dtype=jar"/>
+	  <arg value="-Dtypes=jar,jar,jar"/>
+	  <arg value="@{profile}"/>
+	</artifact:mvn>
+      </sequential>
+    </macrodef>
+
+    <target name="mvn-deploy" depends="mvn-taskdef, bin-package, simpledeploy, signanddeploy"
+     description="To deploy jar's to a maven repository"/>
+
+    <target name="signanddeploy" if="staging">
+      <deploy repo-url="${staging_repo_url}" repo-id="${staging_repo_id}" plugin="${gpg-plugin}" profile="-Pgpg"/>
+    </target> 
+
+    <target name="simpledeploy" unless="staging">
+      <deploy plugin="${deploy-plugin}"/>
+    </target>
+
     <!-- ====================================================== -->
     <!-- mvn-install. Installing the jar and pom file to .m2    -->
     <!-- ====================================================== -->
      
-     <target name="ant-task-download" description="To download mvn-ant-task">
-       <get src="${ant_task_repo_url}" dest="${ant_task.jar}" usetimestamp="true"/>
+     <target name="mvn-taskdef" depends="ivy-retrieve-mvn-ant-task">
+        <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+        uri="antlib:org.apache.maven.artifact.ant" classpathref="mvn-ant-task-classpath"/>
      </target>
 
-     <target name="mvn-taskdef" depends="ant-task-download">
-       <path id="mvn-ant-task.classpath" path="${ant_task.jar}"/>
-       <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
-         uri="antlib:org.apache.maven.artifact.ant"
-         classpathref="mvn-ant-task.classpath"/>
-     </target>
- 
-     <target name="mvn-install" depends="tar, mvn-taskdef">
+     <target name="mvn-install" depends="bin-package, mvn-taskdef">
        <echo message="${dist.maven.dir}/${final.name}.pom" />
        <echo message="${dist.maven.dir}/${final.name}.jar" />
        <echo message="${dist.maven.dir}/${final.name}-sources.jar" />
        <echo message="${dist.maven.dir}/${final.name}-javadoc.jar" />
        <echo message="${dist.maven.dir}/${final.name}-tests.jar" />
   
-       <artifact:pom id="zookeeper-pom" file="${dist.maven.dir}/${final.name}.pom"/>
+       <artifact:pom id="zookeeper-pom" file="${dist.maven.dir}/${name}.pom"/>
        <echo>The version is ${zookeeper-pom.version}</echo>
        <echo message="${dist.maven.dir}/${final.name}.jar" />
      

Modified: zookeeper/branches/branch-3.4/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/ivy.xml?rev=1552470&r1=1552469&r2=1552470&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/ivy.xml (original)
+++ zookeeper/branches/branch-3.4/ivy.xml Fri Dec 20 01:29:22 2013
@@ -29,6 +29,7 @@
     <conf name="master"/>
     <conf name="default"/>
     <conf name="test"/>
+    <conf name="mvn-ant-task" visibility="private"/>
     <conf name="package" extends="master"/>
     <conf name="jdiff" visibility="private"/>
     <conf name="releaseaudit" visibility="private" description="Artifacts required for releaseaudit target"/>
@@ -42,6 +43,8 @@
     <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
   
+    <dependency org="org.apache.maven.wagon" name="wagon-http" rev="2.4" conf="mvn-ant-task->default"/>
+    <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.3" conf="mvn-ant-task->default"/>
     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
     <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false" conf="default"/>
     <dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf="default"/>