Skip to content

Commit

Permalink
Corrected stage of maven artifacts to properly include source/docs.
Browse files Browse the repository at this point in the history
Change-Id: Ife95d2f4b1033caa34e6defae4f7339c3a8a82bc
Reviewed-on: http://review.couchbase.org/12578
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
  • Loading branch information
ragsns authored and ingenthr committed Jan 22, 2012
1 parent 5a32571 commit c7ebfe5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions build.xml
Expand Up @@ -477,18 +477,19 @@


<target name="mvn-install" depends="jar,srcjar,package,mvn-prep" <target name="mvn-install" depends="jar,srcjar,package,mvn-prep"
description="Install couchbase-client in local m2 repository"> description="Install couchbase-client in local m2 repository">
<!-- @todo: change to use ivy publish -->
<artifact:pom id="couchbase-client" file="${couchbase-client.pom}" /> <artifact:pom id="couchbase-client" file="${couchbase-client.pom}" />
<artifact:install file="${build.dir}/${name}-${version}.jar"> <artifact:install file="${build.dir}/jars/${name}-${version}.jar">
<pom refid="${name}" /> <pom refid="${name}" />
<attach file="${build.dir}/${name}-${version}-sources.jar" <attach file="${build.dir}/sources/${name}-${version}.jar"
classifier="sources" /> classifier="sources" />
<attach file="${build.dir}/${name}-${version}-javadoc.jar" <attach file="${build.dir}/javadocs/${name}-${version}.jar"
classifier="javadocs" /> classifier="javadocs" />
</artifact:install> </artifact:install>
<artifact:pom id="couchbase-client-test" file="${couchbase-client-test.pom}" /> <artifact:pom id="couchbase-client-test" file="${couchbase-client-test.pom}" />
<artifact:install file="${build.dir}/${name}-test-${version}.jar"> <artifact:install file="${build.dir}/jars/${name}-test-${version}.jar">
<pom refid="${name}-test" /> <pom refid="${name}-test" />
<attach file="${build.dir}/${name}-test-${version}-sources.jar" <attach file="${build.dir}/sources/${name}-test-${version}.jar"
classifier="sources" /> classifier="sources" />
</artifact:install> </artifact:install>
</target> </target>
Expand Down
2 changes: 1 addition & 1 deletion ivy.xml
Expand Up @@ -42,7 +42,7 @@ SOFTWARE.
<artifact type="pom" ext="pom" conf="default"/> <artifact type="pom" ext="pom" conf="default"/>
<artifact type="jar" ext="jar" conf="default"/> <artifact type="jar" ext="jar" conf="default"/>
<artifact type="source" ext="jar" conf="sources" m:classifier="sources"/> <artifact type="source" ext="jar" conf="sources" m:classifier="sources"/>
<artifact type="javadoc" ext="jar" conf="sources" m:classifier="javadocs"/> <artifact type="javadoc" ext="jar" conf="sources" m:classifier="javadoc"/>
</publications> </publications>


<dependencies defaultconfmapping="%->default,sources()"> <dependencies defaultconfmapping="%->default,sources()">
Expand Down

0 comments on commit c7ebfe5

Please sign in to comment.