Skip to content
Browse files

LPS-40973 Change variable so that ivy doesn't override

  • Loading branch information...
1 parent 039ea19 commit ca3395742948fceda1d5922dd00ffe4866283742 @shinnlok shinnlok committed with brianchandotcom Oct 4, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 build-common-ivy.xml
  2. +1 −1 build.properties
  3. +1 −1 ivy-settings-publisher.xml
View
2 build-common-ivy.xml
@@ -41,7 +41,7 @@
<if>
<isfalse value="${ivy.xml.unmodified}" />
<then>
- <ivy:settings file="${ivy.settings.file}" />
+ <ivy:settings file="${ivy.custom.settings.file}" />
<ivy:resolve
file="@{ivy.xml.dir}/ivy.xml"
View
2 build.properties
@@ -164,8 +164,8 @@
## Ivy
##
+ ivy.custom.settings.file=${sdk.dir}/ivy-settings.xml
ivy.jar.url=http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar
- ivy.settings.file=${sdk.dir}/ivy-settings.xml
ivy.version=2.3.0
ivy.pom.developer.name=Brian Wing Shun Chan
View
2 ivy-settings-publisher.xml
@@ -1,5 +1,5 @@
<ivysettings>
- <include file="ivy-settings.xml" />
+ <include file="${ivy.custom.settings.file}" />
<credentials host="${sonatype.release.hostname}" realm="${sonatype.release.realm}" passwd="${sonatype.release.password}" username="${sonatype.release.username}" />
<credentials host="${sonatype.snapshot.hostname}" realm="${sonatype.snapshot.realm}" passwd="${sonatype.snapshot.password}" username="${sonatype.snapshot.username}" />

0 comments on commit ca33957

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