svn commit: r1422169 - in /zookeeper/branches/branch-3.4: CHANGES.txt build.xml

[ph...@apache.org]

Author: phunt
Date: Sat Dec 15 00:43:28 2012
New Revision: 1422169

URL: http://svn.apache.org/viewvc?rev=1422169&view=rev
Log:
ZOOKEEPER-1584. Adding mvn-install target for deploying the zookeeper artifacts to .m2 repository (Ashish Singh via phunt)

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

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1422169&r1=1422168&r2=1422169&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Sat Dec 15 00:43:28 2012
@@ -38,6 +38,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1583. Document maxClientCnxns in conf/zoo_sample.cfg
   (Christopher Tubbs via phunt)
 
+  ZOOKEEPER-1584. Adding mvn-install target for deploying the
+  zookeeper artifacts to .m2 repository (Ashish Singh via phunt)
+
 
 Release 3.4.5 - 2012-09-30
 

Modified: zookeeper/branches/branch-3.4/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/build.xml?rev=1422169&r1=1422168&r2=1422169&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/build.xml (original)
+++ zookeeper/branches/branch-3.4/build.xml Sat Dec 15 00:43:28 2012
@@ -17,7 +17,10 @@
    limitations under the License.
 -->
 
-<project name="ZooKeeper" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="ZooKeeper" default="jar" 
+xmlns:ivy="antlib:org.apache.ivy.ant"
+xmlns:artifact="antlib:org.apache.maven.artifact.ant"
+xmlns:maven="antlib:org.apache.maven.artifact.ant">
 
     <property name="Name" value="ZooKeeper" />
     <property name="name" value="zookeeper" />
@@ -108,7 +111,14 @@
     <property name="ivy.test.lib" value="${build.dir}/test/lib"/>
     <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
     <property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
-
+    
+    <property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
+    <property name="tsk.org" value="/org/apache/maven/maven-ant-tasks/"/>
+    <property name="ant-task.version" value="2.1.3"/>
+    <property name="ant_task_repo_url"
+        value="${mvnrepo}${tsk.org}${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/>
+    <property name="ant_task.jar" location="${ivy.lib}/maven-ant-tasks-${ant-task.version}.jar"/>
+    
     <available property="clover.present"
                classname="com.cenqua.clover.CloverInstr"
                classpath="${clover.home}/lib/clover.jar"/>
@@ -1085,6 +1095,41 @@
       <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
 
     </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>
+
+     <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">
+       <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"/>
+       <echo>The version is ${zookeeper-pom.version}</echo>
+       <echo message="${dist.maven.dir}/${final.name}.jar" />
+     
+       <artifact:install file="${dist.maven.dir}/${final.name}.jar">
+         <pom refid="zookeeper-pom" />
+         <attach file="${dist.maven.dir}/${final.name}.jar" type="jar"/>
+         <attach file="${dist.maven.dir}/${final.name}-sources.jar" type="jar" classifier="sources"/>
+         <attach file="${dist.maven.dir}/${final.name}-javadoc.jar" type="jar" classifier="javadoc"/>
+         <attach file="${dist.maven.dir}/${final.name}-tests.jar" type="jar" classifier="tests"/>
+       </artifact:install>
+    </target>
 
     <!-- ====================================================== -->
     <!-- Clean.  Delete the build files, and their directories  -->