Permalink
Browse files

Make log4j, spring-beans optional in our maven artifacts.

Change-Id: I579a5832fc4ff0ed9d4303c80b309a25dc8cfbaf
Reviewed-on: http://review.couchbase.org/14159
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
  • Loading branch information...
1 parent 9cc52e6 commit 0c5bacddda66ede2ee80971b19255bfe8643c4b4 @ingenthr ingenthr committed with mikewied Mar 21, 2012
Showing with 6 additions and 8 deletions.
  1. +6 −2 build.xml
  2. +0 −2 ivy/spymemcached-test.xml
  3. +0 −4 ivy/spymemcached.xml
View
@@ -459,13 +459,17 @@
settingsRef="${name}.ivy.settings">
<mapping conf="default" scope="compile" />
<mapping conf="runtime" scope="runtime" />
+ <dependency group="log4j" artifact="log4j" version="${log4j.version}" optional="true" />
+ <dependency group="org.springframework" artifact="spring-beans" version="${spring-beans.version}" optional="true" />
</ivy:makepom>
<ivy:makepom ivyfile="ivy/spymemcached-test.xml"
pomfile="${spymemcached-test.pom}"
settingsRef="${name}.ivy.settings">
- <mapping conf="default" scope="compile" />
- <mapping conf="runtime" scope="runtime" />
+ <mapping conf="default" scope="compile" />
+ <mapping conf="runtime" scope="runtime" />
+ <dependency group="log4j" artifact="log4j" version="${log4j.version}" optional="true" />
+ <dependency group="org.springframework" artifact="spring-beans" version="${spring-beans.version}" optional="true" />
</ivy:makepom>
<!-- Change the version in the pom file to reflect our claimed version. -->
@@ -44,9 +44,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
- <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="default" />
<dependency org="jmock" name="jmock" rev="${jmock.version}" conf="default" />
<dependency org="junit" name="junit" rev="${junit.version" conf="default" />
- <dependency org="org.springframework" name="spring-beans" rev="${spring-beans.version}" conf="default" />
</dependencies>
</ivy-module>
@@ -43,8 +43,4 @@
<!--get the artifact from our module name-->
<artifact conf="master"/>
</publications>
- <dependencies>
- <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="default" />
- <dependency org="org.springframework" name="spring-beans" rev="${spring-beans.version}" conf="default" />
- </dependencies>
</ivy-module>

0 comments on commit 0c5bacd

Please sign in to comment.