From 2fe74a4ef0cb8f667c4fa342e649bc75da4d8a6a Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 13 Apr 2012 16:46:26 +0300
Subject: [PATCH] Eliminate INDEX.LIST from Spring jar META-INF dirs

The contents of this file could be problematic as they were generated
by spring-build with "org.springframework.core.jar" EBR-style naming,
but this naming is incorrect when dealing with Maven-central style
artifacts, e.g. spring-core.jar.

While a well-formed INDEX.LIST may speed up classloading, the simplest
solution to the issues listed below is simply to eliminate the file.
This also means consistent treatment across 3.1.x and 3.2.x artifacts,
as the new Gradle build in 3.2.x does not create these index files.

Issue: SPR-6383, SPR-9208
---
 build-spring-framework/resources/changelog.txt | 3 ++-
 spring-build/common/artifact.xml               | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt
index f2e5da84dbf..08f56b78629 100644
--- a/build-spring-framework/resources/changelog.txt
+++ b/build-spring-framework/resources/changelog.txt
@@ -3,9 +3,10 @@ SPRING FRAMEWORK CHANGELOG
 http://www.springsource.org
 
 
-Changes in version 3.1.2 (2012-03-29)
+Changes in version 3.1.2 (2012-??-??)
 -------------------------------------
 
+* removed INDEX.LIST entries from Spring jar META-INF dirs
 * fixed OSGi metadata for optional "javax.inject" package import
 * fixed AbstractResource's InputStream-based "contentLength()" implementation
 * fixed MutablePropertySources "get" implementation to correctly return null if not found
diff --git a/spring-build/common/artifact.xml b/spring-build/common/artifact.xml
index bf00a872a30..b328c0e444a 100644
--- a/spring-build/common/artifact.xml
+++ b/spring-build/common/artifact.xml
@@ -44,7 +44,7 @@
 		<ivy:retrieve resolveId="additional.classpath" conf="additional" type="jar" transitive="false"
 				pattern="${main.output.dir}/[artifact]-[revision].[ext]" log="download-only"/>
 		<antcall target="bundlor"/>
-		<jar destfile="${jar.output.file}" basedir="${main.output.dir}" index="true" filesetmanifest="merge">
+		<jar destfile="${jar.output.file}" basedir="${main.output.dir}" index="false" filesetmanifest="merge">
 			<manifest>
 				<attribute name="Bundle-ManifestVersion" value="2"/>
 				<attribute name="Bundle-Version" value="${bundle.version}"/>
@@ -53,7 +53,7 @@
 				<attribute name="Implementation-Version" value="${implementation.version}"/>
 			</manifest>
 		</jar>
-		<jar destfile="${source-jar.output.file}" basedir="${main.java.dir}" index="true"/>
+		<jar destfile="${source-jar.output.file}" basedir="${main.java.dir}" index="false"/>
 		<ivy:publish resolver="integration" pubdate="${timestamp}" status="${release.type}">
 			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${jar.output.dir}/[artifact].[ext]"/>
@@ -117,4 +117,4 @@
 		</copy>
 	</target>
 
-</project>
\ No newline at end of file
+</project>