Package: spring-build / 2.7.0-2

ivy_artifact.diff Patch series | download
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
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
Description: Don't use Ivy for Spring Build own dependencies
 resolution. Use explicit classpath references.
Author: Damien Raude-Morvan <drazzib@debian.org>
Forwarded: not-needed
Last-Update: 2010-06-19
--- a/org.springframework.build.ant/ivy.xml
+++ b/org.springframework.build.ant/ivy.xml
@@ -19,8 +19,10 @@
 	</publications>
 
 	<dependencies>
-		<dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="1.7.0" conf="provided->compile"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.net" rev="1.4.1" conf="provided->compile"/>
+<!--
+		<dependency org="org.apache.ant" name="ant" rev="debian" conf="provided->compile"/>
+		<dependency org="commons-net" name="commons-net" rev="2.x" conf="provided->compile"/>
+-->
 	</dependencies>
 
 </ivy-module>
--- a/project-build/standard/artifact.xml
+++ b/project-build/standard/artifact.xml
@@ -22,13 +22,25 @@
 
 <!-- Other targets -->
 	<target name="compile.init" depends="ivy.init">
+<!--
 		<ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath"
 				organisation="org.springframework.build" module="org.springframework.build.ant"
 				revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
 				log="download-only"/>
+-->
+		<path id="spring.ant.classpath">
+			<pathelement path="${spring.ant.classpath}"/>
+		</path>
+<!--
 		<ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt"
 				module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}"
 				conf="runtime" type="jar" inline="true" log="download-only"/>
+-->
+
+		<path id="ecj.classpath">
+			<pathelement path="${ecj.classpath}"/>
+		</path>
+
 		<taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
 			<classpath>
 				<path refid="spring.ant.classpath"/>
@@ -37,4 +49,4 @@
 		</taskdef>
 	</target>
 
-</project>
\ No newline at end of file
+</project>
--- a/project-build/weaving-external/artifact.xml
+++ b/project-build/weaving-external/artifact.xml
@@ -58,9 +58,14 @@
 				organisation="org.springframework.build" module="org.springframework.build.ant"
 				revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
 				log="download-only"/>
+<!--
 		<ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt"
 				module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}"
 				conf="runtime" type="jar" inline="true" log="download-only"/>
+-->
+                <path id="ecj.classpath">
+                        <pathelement path="${ecj.classpath}"/>
+                </path>
 		<taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
 			<classpath>
 				<path refid="spring.ant.classpath"/>
@@ -80,4 +85,4 @@
 		</bundlor:bundlor>
 	</target>
 
-</project>
\ No newline at end of file
+</project>
--- a/project-build/war/artifact.xml
+++ b/project-build/war/artifact.xml
@@ -60,9 +60,14 @@
 				organisation="org.springframework.build" module="org.springframework.build.ant"
 				revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
 				log="download-only"/>
+<!--
 		<ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt"
 				module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}"
 				conf="runtime" type="jar" inline="true" log="download-only"/>
+-->
+                <path id="ecj.classpath">
+                        <pathelement path="${ecj.classpath}"/>
+                </path>
 		<taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
 			<classpath>
 				<path refid="spring.ant.classpath"/>
@@ -82,4 +87,4 @@
 		</bundlor:bundlor>
 	</target>
 
-</project>
\ No newline at end of file
+</project>
--- a/org.springframework.build.aws.ant/ivy.xml
+++ b/org.springframework.build.aws.ant/ivy.xml
@@ -19,8 +19,10 @@
 	</publications>
 
 	<dependencies>
+<!--
 		<dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="1.7.0" conf="provided->compile"/>
 		<dependency org="org.jets3t" name="com.springsource.org.jets3t" rev="0.6.1" conf="compile->compile;runtime->runtime"/>
+-->
 	</dependencies>
 
 </ivy-module>
--- a/org.springframework.build.aws.ivy/ivy.xml
+++ b/org.springframework.build.aws.ivy/ivy.xml
@@ -19,9 +19,11 @@
 	</publications>
 
 	<dependencies>
+<!--
 		<dependency org="org.jets3t" name="com.springsource.org.jets3t" rev="0.7.0" conf="compile->compile;runtime->runtime"/>
 		<dependency org="org.apache.ant" name="com.springsource.org.apache.ivy" rev="2.0.0.beta2" conf="compile->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.httpclient" rev="3.1.0" conf="runtime->runtime"/>
+-->
 	</dependencies>
 
 </ivy-module>
--- a/org.springframework.build.osgi/ivy.xml
+++ b/org.springframework.build.osgi/ivy.xml
@@ -19,9 +19,11 @@
 	</publications>
 
 	<dependencies>
+<!--
 		<dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="1.7.0" conf="provided->runtime"/>
 		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.5.0.v20090311-1300" conf="compile->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/>
+-->
 	</dependencies>
 
 </ivy-module>