spring-build (2.7.0-2) ivy_local_only.diff

Summary

 project-build/common/ivysettings.xml |   27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

    
download this patch

Patch contents

Description: Only use local Ivy repository (no download)
Author: Damien Raude-Morvan <drazzib@debian.org>
Forwarded: not-needed
Last-Update: 2010-06-19
--- a/project-build/common/ivysettings.xml
+++ b/project-build/common/ivysettings.xml
@@ -16,8 +16,6 @@
 -->
 <ivysettings>
 
-	<typedef name="s3" classname="org.springframework.aws.ivy.S3Resolver"/>
-
 	<settings defaultResolver="external-lookup" defaultLatestStrategy="latest-lexico"/>
 
 	<caches resolutionCacheDir="${ivy.cache.dir}/resolution" repositoryCacheDir="${ivy.cache.dir}/repository"
@@ -51,32 +49,31 @@
 
 <!-- Lookup repositories -->
 		<chain name="external-lookup" returnFirst="true">
-			<localrepo name="local-external-repository"/>
-			<s3repo name="bundle-external-repository"	bucket="repository.springsource.com" artifact.type="bundles" release.type="external"/>
-			<s3repo name="library-external-repository"	bucket="repository.springsource.com" artifact.type="libraries" release.type="external"/>
+			<filesystem name="local-maven-repo" m2compatible="true" local="true">
+				<ivy pattern="/usr/share/maven-repo/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).pom"/>
+				<artifact pattern="/usr/share/maven-repo/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).jar"/>
+			</filesystem>
+<!--
+			<filesystem name="local-java" local="true">
+				<artifact pattern="/usr/share/java/[module].jar"/>
+			</filesystem>
+-->
 		</chain>
 
 		<chain name="spring-portfolio-lookup" returnFirst="true">
 			<resolver ref="integration"/>
 			<localrepo name="local"/>
-			<s3repo name="bundle-release-repository"	bucket="repository.springsource.com" artifact.type="bundles" release.type="release"/>
-			<s3repo name="bundle-milestone-repository"	bucket="repository.springsource.com" artifact.type="bundles" release.type="milestone"/>
-			<s3repo name="bundle-snapshot-repository"	bucket="repository.springsource.com" artifact.type="bundles" release.type="snapshot"/>
-			<s3repo name="library-release-repository"	bucket="repository.springsource.com" artifact.type="libraries" release.type="release"/>
-			<s3repo name="library-milestone-repository"	bucket="repository.springsource.com" artifact.type="libraries" release.type="milestone"/>
-			<s3repo name="library-snapshot-repository"	bucket="repository.springsource.com" artifact.type="libraries" release.type="snapshot"/>
+			<resolver ref="external-lookup"/>
 		</chain>
 
 <!-- Publishing repositories -->
-		<s3repo name="ebr-bundle-publish"	bucket="${publish.bucket}"	artifact.type="bundles" 	release.type="${adjusted.release.type}"/>
-		<s3repo name="ebr-library-publish"	bucket="${publish.bucket}"	artifact.type="libraries"	release.type="${adjusted.release.type}"/>
 		<localrepo name="local-bundle-publish"/>
 		<localrepo name="local-library-publish"/>
 	</resolvers>
 
 	<modules>
-		<module organisation="org.springframework.*"	name="*"	resolver="spring-portfolio-lookup"/>
-		<module organisation="com.springsource.*"		name="*"	resolver="spring-portfolio-lookup"/>
+		<module organisation="org.springframework.*"    name="*"        resolver="spring-portfolio-lookup"/>
+		<module organisation="com.springsource.*"               name="*"        resolver="spring-portfolio-lookup"/>
 	</modules>
 
 </ivysettings>