root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Chris Beams 2012-04-13 16:46:26 +03:00
parent ee9b9d6a57
commit 2fe74a4ef0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build-spring-framework/resources/changelog.txt
View File

@ -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

6
spring-build/common/artifact.xml
View File

@ -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>
</project>