lib/README @@ -41,33 +41,46 @@ SOFTWARE. <!-- Maven --> <!-- ================================================================== --> -<target name="mvn-init" unless="compile.classpath" xmlns:artifact="urn:maven-artifact-ant"> - <path id="maven.ant.tasks.classpath" path="${lib.dir}/maven-ant-tasks-2.0.10.jar" /> - - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" - classpathref="maven.ant.tasks.classpath"/> + <target name="mvn-init" unless="compile.classpath" xmlns:artifact="urn:maven-artifact-ant"> + <path id="maven.ant.tasks.classpath" path="${lib.dir}/maven-ant-tasks-2.0.10.jar" /> + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" + classpathref="maven.ant.tasks.classpath"/> - <condition property="maven.repo.local" value="${maven.repo.local}" else="${user.home}/.m2/repository"> - <isset property="maven.repo.local"/> - </condition> + <condition property="maven.repo.local" value="${maven.repo.local}" else="${user.home}/.m2/repository"> + <isset property="maven.repo.local"/> + </condition> + + <echo>maven.repo.local=${maven.repo.local}</echo> + <artifact:localRepository id="local.repository" path="${maven.repo.local}"/> + <artifact:pom file="pom.xml" id="maven.project"/> + + <artifact:dependencies pathId="compile.classpath" filesetId="compile.fileset" useScope="compile"> + <pom refid="maven.project"/> + <localRepository refid="local.repository"/> + </artifact:dependencies> - <echo>maven.repo.local=${maven.repo.local}</echo> - <artifact:localRepository id="local.repository" path="${maven.repo.local}"/> - <artifact:pom file="pom.xml" id="maven.project"/> - <artifact:dependencies pathId="compile.classpath" filesetId="compile.fileset" useScope="compile"> - <pom refid="maven.project"/> - <localRepository refid="local.repository"/> - </artifact:dependencies> - <artifact:dependencies pathId="test.classpath" filesetId="test.fileset" useScope="test"> - <pom refid="maven.project"/> - <localRepository refid="local.repository"/> - </artifact:dependencies> - <artifact:dependencies pathId="runtime.classpath" filesetId="runtime.fileset" useScope="runtime"> - <pom refid="maven.project"/> - <localRepository refid="local.repository"/> - </artifact:dependencies> -</target> + <artifact:dependencies pathId="test.classpath" filesetId="test.fileset" useScope="test"> + <pom refid="maven.project"/> + <localRepository refid="local.repository"/> + </artifact:dependencies> + + <artifact:dependencies pathId="runtime.classpath" filesetId="runtime.fileset" useScope="runtime"> + <pom refid="maven.project"/> + <localRepository refid="local.repository"/> + </artifact:dependencies> + </target> + <target name="mvn-deploy" xmlns:artifact="urn:maven-artifact-ant" depends="mvn-init"> + <fail unless="repoUrl"> + You must specify the repoUrl (-DrepoUrl=xxx) when deploying! + </fail> + + <artifact:deploy file="${build.dir}/${jar.name}"> + <remoteRepository url="${repoUrl}"/> + <pom refid="maven.project"/> + </artifact:deploy> + </target> + <!-- ================================================================== --> <!-- Build sources --> <!-- ================================================================== --> @@ -301,11 +314,20 @@ SOFTWARE. <!-- ================================================================== --> + <!-- Deploy to Maven repo --> + <!-- ================================================================== --> + + <target name="deploy" + depends="jar, mvn-deploy" + description="--> deploy SNAPSHOT jar to 101tec Nexus repository"> + </target> + + <!-- ================================================================== --> <!-- Generate a distribution --> <!-- ================================================================== --> <target name="dist" - depends="test, test-it, jar, doc" + depends="test-all, jar, doc" description="--> create a tarball distribution"> <delete dir="${build.dir.dist}" /> @@ -318,7 +340,6 @@ SOFTWARE. <mkdir dir="${build.dir.dist}/docs/javadoc" /> <mkdir dir="${build.dir.dist}/docs/reports" /> <mkdir dir="${build.dir.dist}/lib" /> - <mkdir dir="${build.dir.dist}/repo" /> <mkdir dir="${build.dir.dist}/src" /> <!-- copy launch script to target --> @@ -336,11 +357,6 @@ SOFTWARE. <fileset dir="${lib.dir}" /> </copy> - <!-- copy our local maven repo --> - <copy todir="${build.dir.dist}/repo"> - <fileset dir="${basedir}/repo" /> - </copy> - <!-- copy src --> <copy todir="${build.dir.dist}/src"> <fileset dir="${basedir}/src" /> @@ -446,14 +462,14 @@ SOFTWARE. </macrodef> <target name="clean-all"> + <antcall target="clean" /> <iterate target="clean" /> </target> <target name="test-all" + depends="test, test-it" description="--> run all tests"> - - <iterate target="test" /> </target> </project> build.xml @@ -20,7 +20,9 @@ <url>scm:git:git://github.com/emi/bixo.git</url> </scm> <packaging>jar</packaging> - <version>1.0-SNAPSHOT</version> + <!-- Must be kept in sync with "version" value in build.properties --> + <version>0.4.1-SNAPSHOT</version> + <repositories> <repository> <id>101tec Public</id> @@ -35,19 +37,6 @@ </snapshots> </repository> - <repository> - <id>bixo-local</id> - <name>Local repository for non-public jars used by Bixo</name> - <url>file://${basedir}/repo/</url> - <releases> - <enabled>true</enabled> - <checksumPolicy>ignore</checksumPolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - </repository> </repositories> <dependencies> @@ -55,15 +44,15 @@ <!-- Compile time dependencies --> <dependency> - <groupId>org.apache</groupId> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> - <version>0.19.0</version> + <version>0.19.2</version> </dependency> <dependency> <groupId>cascading</groupId> <artifactId>cascading-core</artifactId> - <version>1.0.13</version> + <version>1.0.16</version> </dependency> <dependency> @@ -150,9 +139,9 @@ </dependency> <dependency> - <groupId>org.apache</groupId> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-test</artifactId> - <version>0.19.0</version> + <version>0.19.2</version> <scope>test</scope> </dependency> @@ -163,9 +152,10 @@ <scope>test</scope> </dependency> - <!-- These two jars could be a runtime dependency of hadoop-test, - but it doesn't seem to work (not picked up) if we - do it that way --> + <!-- These two jars could be a runtime dependency of hadoop-core, + but it doesn't seem to work for running unit tests that use + Hadoop. + --> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>jasper</artifactId> @@ -179,11 +169,11 @@ <version>3.1</version> <scope>test</scope> </dependency> - + <dependency> <groupId>cascading</groupId> <artifactId>cascading-test</artifactId> - <version>1.0.13</version> + <version>1.0.16</version> <scope>test</scope> </dependency> @@ -219,10 +209,11 @@ <dependency> <groupId>ant-eclipse</groupId> - <artifactId>ant-eclipse</artifactId> - <version>1.0-jvm1.2</version> + <artifactId>ant-eclipse-jvm1.2</artifactId> + <version>1.0</version> <scope>eclipse</scope> </dependency> </dependencies> + </project> pom.xml 9ff0a90d1ce1502ddb82e28a278aa6d609beba33 Ken Krugler kkrugler@transpac.com http://github.com/emi/bixo/commit/685870394eca7318f14356b281036b2ffcf5bffd 685870394eca7318f14356b281036b2ffcf5bffd 2009-09-21T12:40:47-07:00 2009-09-21T12:40:47-07:00 Complete the switch to using Maven for jar dependencies. Note that test coverage reports need to be re-enabled. 463c28f2c4fd5b80de191617f857cd0994639092 Ken Krugler kkrugler@transpac.com