Project

General

Profile

« Previous | Next » 

Revision 7624

create the lib/maven directory in order to resolve the deps and carry on with the build.

View differences:

build.xml
102 102
	
103 103
	<target name="init" depends="config" unless="init.called">
104 104
		
105
	    <property name="libdir.mvn" value="lib/maven" />
106
		<mkdir dir="${libdir.mvn}"/>
107
		
105 108
		<path id="base.classpath">
106 109
			<pathelement location="${jsdk}" />
107 110
            <pathelement location="lib" />
......
115 118
			</fileset>
116 119

  
117 120
			<!-- Include everything from maven -->
118
			<fileset dir="lib/maven">
121
			<fileset dir="${libdir.mvn}">
119 122
				<include name="*.jar" />
120 123
			</fileset>
121 124

  
......
132 135
				<include name="*.jar" />
133 136
			</fileset>
134 137
			<!-- Include maven -->
135
			<fileset dir="lib/maven">
138
			<fileset dir="${libdir.mvn}">
136 139
				<include name="*.jar" />
137 140
			</fileset>
138 141
		</path>
......
146 149
		<artifact:pom id="metacatPom" file="pom.xml" />
147 150
		<artifact:dependencies filesetId="dependency.fileset" pomrefid="metacatPom" usescope="runtime"/>
148 151
		<artifact:dependencies pathId="dependency.classpath" pomrefid="metacatPom"/>
149
	   	
150
	    <property name="libdir.mvn" value="lib/maven" />
151
	   	
152
	   		   	
152 153
	   	<!-- combine base and dependencies for the classpath -->
153 154
	   	<path id="compile.classpath">
154 155
	   		<path refid="base.classpath" />	
......
930 931
				<include name="*.jar" />
931 932
				<exclude name="maven-ant-tasks*.jar" />
932 933
			</fileset>
933
			<fileset dir="lib/maven" />			
934
			<fileset dir="${libdir.mvn}" />			
934 935
		</copy>
935 936
		<!-- MCD copy file="lib/web.xml.${tomcatversion}"
936 937
			tofile="${build.war}/web.xml" / -->
......
1318 1319
			<fileset dir="lib/dtd"/>
1319 1320
			<fileset dir="lib/schema"/>
1320 1321
			<fileset dir="${utilitiesdir}"/>
1322
			<fileset dir="${libdir.mvn}"/>
1321 1323
		</delete>
1322 1324
		<!-- clean up the distribution files if they exist-->
1323 1325
		<delete file="./${name}-bin-${release}.tar.gz" />

Also available in: Unified diff