Blame apache-ivy-global-settings.patch
|
Mikolaj Izdebski |
f4d26e |
--- src/java/org/apache/ivy/ant/IvyAntSettings.java~ 2012-08-15 23:24:56.000000000 +0200
|
|
Mikolaj Izdebski |
f4d26e |
+++ src/java/org/apache/ivy/ant/IvyAntSettings.java 2014-01-16 14:03:25.403925272 +0100
|
|
Mikolaj Izdebski |
f4d26e |
@@ -343,7 +343,8 @@
|
|
Mikolaj Izdebski |
f4d26e |
new File(getProject().getBaseDir(), settingsFileName),
|
|
Mikolaj Izdebski |
f4d26e |
new File(getProject().getBaseDir(), "ivyconf.xml"),
|
|
Mikolaj Izdebski |
f4d26e |
new File(settingsFileName),
|
|
Mikolaj Izdebski |
f4d26e |
- new File("ivyconf.xml")
|
|
Mikolaj Izdebski |
f4d26e |
+ new File("ivyconf.xml"),
|
|
Mikolaj Izdebski |
f4d26e |
+ new File("/etc/ivy/ivysettings.xml")
|
|
Mikolaj Izdebski |
f4d26e |
};
|
|
Mikolaj Izdebski |
f4d26e |
for (int i = 0; i < settingsLocations.length; i++) {
|
|
Mikolaj Izdebski |
f4d26e |
file = settingsLocations[i];
|