Browse Source

Expand repackaged asm/cglib jars into spring-core

Prior to this change, the repackaged spring-asm and spring-cglib jars
were being included wholesale in the spring-core jar, whereas the
intention was to include the unzipped classfiles.

This change ensures that spring-asm and spring-cglib jars are unzipped
on the fly when creating the spring-core jar.

Issue: SPR-9669
pull/120/head
Chris Beams 14 years ago
parent
commit
4e0977ccdd
  1. 10
      build.gradle
  2. 6
      src/dist/license.txt

10
build.gradle

@ -172,11 +172,13 @@ project('spring-core') { @@ -172,11 +172,13 @@ project('spring-core') {
jar {
// inline all repackaged asm and cglib classes directly into the spring-core jar
from(asmRepackJar) {
exclude 'META-INF/**'
dependsOn asmRepackJar
from(zipTree(asmRepackJar.archivePath)) {
include 'org/springframework/asm/**'
}
from(cglibRepackJar) {
exclude 'META-INF/**'
dependsOn cglibRepackJar
from(zipTree(cglibRepackJar.archivePath)) {
include 'org/springframework/cglib/**'
}
}
}

6
src/dist/license.txt vendored

@ -202,10 +202,10 @@ @@ -202,10 +202,10 @@
=======================================================================
SPRING FRAMEWORK 3.2 SUBCOMPONENTS:
SPRING FRAMEWORK ${version} SUBCOMPONENTS:
Spring Framework 3.2 includes a number of subcomponents with
separate copyright notices and license terms. The product that
Spring Framework ${version} includes a number of subcomponents
with separate copyright notices and license terms. The product that
includes this file does not necessarily use all the open source
subcomponents referred to below. Your use of the source
code for these subcomponents is subject to the terms and

Loading…
Cancel
Save