Skip to content
Browse files

Corrected stage of maven artifacts to properly include source/docs.

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...
1 parent 5a32571 commit c7ebfe50c83c1692ed6841637b86c8dbb1cebae3 @ragsns ragsns committed with ingenthr Jan 22, 2012
Showing with 7 additions and 6 deletions.
  1. +6 −5 build.xml
  2. +1 −1 ivy.xml
View
11 build.xml
@@ -477,18 +477,19 @@
<target name="mvn-install" depends="jar,srcjar,package,mvn-prep"
description="Install couchbase-client in local m2 repository">
+ <!-- @todo: change to use ivy publish -->
<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}" />
- <attach file="${build.dir}/${name}-${version}-sources.jar"
+ <attach file="${build.dir}/sources/${name}-${version}.jar"
classifier="sources" />
- <attach file="${build.dir}/${name}-${version}-javadoc.jar"
+ <attach file="${build.dir}/javadocs/${name}-${version}.jar"
classifier="javadocs" />
</artifact:install>
<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" />
- <attach file="${build.dir}/${name}-test-${version}-sources.jar"
+ <attach file="${build.dir}/sources/${name}-test-${version}.jar"
classifier="sources" />
</artifact:install>
</target>
View
2 ivy.xml
@@ -42,7 +42,7 @@ SOFTWARE.
<artifact type="pom" ext="pom" conf="default"/>
<artifact type="jar" ext="jar" conf="default"/>
<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>
<dependencies defaultconfmapping="%->default,sources()">

0 comments on commit c7ebfe5

Please sign in to comment.
Something went wrong with that request. Please try again.