blob: 244a513e9502cb1741187913e471e4e48fd79ac9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- ant-contrib-1.0b3.orig/build.xml 2016-06-25 00:18:39.274662000 -0500
+++ ant-contrib-1.0b3/build.xml 2016-06-25 01:52:50.547085640 -0500
@@ -53,12 +53,12 @@
<target name="init" unless="no-ivy">
<path id="ivy.lib.path">
- <fileset dir="lib/ivy/jars" includes="ivy-2.0.0.jar"/>
- <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
- <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
- <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
- <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>
- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
+ <fileset dir="/usr/share/java/apache-ivy" includes="ivy.jar"/>
+ <fileset dir="/usr/share/java" includes="commons-cli.jar"/>
+ <fileset dir="/usr/share/java" includes="commons-codec.jar"/>
+ <fileset dir="/usr/share/java" includes="commons-httpclient.jar"/>
+ <fileset dir="/usr/share/java" includes="commons-logging.jar"/>
+ <fileset dir="/usr/share/java" includes="oro.jar"/>
</path>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
@@ -109,6 +109,7 @@
classpathref="compile.classpath"
source="${jdk.source}"
target="${jdk.target}"
+ excludes="**/Ivy14Adapter.java"
/>
<copy todir="${target.classes.dir}">
--- ant-contrib-1.0b3.orig/ivysettings.xml 2016-06-25 00:18:38.381370000 -0500
+++ ant-contrib-1.0b3/ivysettings.xml 2016-06-25 01:48:32.389967175 -0500
@@ -5,8 +5,8 @@
<resolvers>
<filesystem name="local">
- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
- <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
+ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" />
+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
</filesystem>
--- ant-contrib-1.0b3.orig/src/main/java/net/sf/antcontrib/net/URLImportTask.java 2016-06-25 00:18:38.968009000 -0500
+++ ant-contrib-1.0b3/src/main/java/net/sf/antcontrib/net/URLImportTask.java 2016-06-25 01:46:26.712467308 -0500
@@ -158,7 +158,7 @@
adapter = new Ivy20Adapter();
}
catch (ClassNotFoundException e) {
- adapter = new Ivy14Adapter();
+ // adapter = new Ivy14Adapter();
}
String setId = org + "." + module + "." + rev + ".fileset";
|
