Browse Source

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
pull/71/merge
Chris Beams 14 years ago
parent
commit
2fe74a4ef0
  1. 3
      build-spring-framework/resources/changelog.txt
  2. 6
      spring-build/common/artifact.xml

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

@ -3,9 +3,10 @@ SPRING FRAMEWORK CHANGELOG
http://www.springsource.org 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 OSGi metadata for optional "javax.inject" package import
* fixed AbstractResource's InputStream-based "contentLength()" implementation * fixed AbstractResource's InputStream-based "contentLength()" implementation
* fixed MutablePropertySources "get" implementation to correctly return null if not found * fixed MutablePropertySources "get" implementation to correctly return null if not found

6
spring-build/common/artifact.xml

@ -44,7 +44,7 @@
<ivy:retrieve resolveId="additional.classpath" conf="additional" type="jar" transitive="false" <ivy:retrieve resolveId="additional.classpath" conf="additional" type="jar" transitive="false"
pattern="${main.output.dir}/[artifact]-[revision].[ext]" log="download-only"/> pattern="${main.output.dir}/[artifact]-[revision].[ext]" log="download-only"/>
<antcall target="bundlor"/> <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> <manifest>
<attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Bundle-Version" value="${bundle.version}"/> <attribute name="Bundle-Version" value="${bundle.version}"/>
@ -53,7 +53,7 @@
<attribute name="Implementation-Version" value="${implementation.version}"/> <attribute name="Implementation-Version" value="${implementation.version}"/>
</manifest> </manifest>
</jar> </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}"> <ivy:publish resolver="integration" pubdate="${timestamp}" status="${release.type}">
<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/> <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
<artifacts pattern="${jar.output.dir}/[artifact].[ext]"/> <artifacts pattern="${jar.output.dir}/[artifact].[ext]"/>
@ -117,4 +117,4 @@
</copy> </copy>
</target> </target>
</project> </project>

Loading…
Cancel
Save