From 4e0977ccddb23ecf94e69f380d6d10c5719605d7 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 11 Aug 2012 12:40:39 +0200 Subject: [PATCH] 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 --- build.gradle | 10 ++++++---- src/dist/license.txt | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 806d03fa39..3d6d2f6993 100644 --- a/build.gradle +++ b/build.gradle @@ -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/**' } } } diff --git a/src/dist/license.txt b/src/dist/license.txt index 59efc2327a..51003b54f1 100644 --- a/src/dist/license.txt +++ b/src/dist/license.txt @@ -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