Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove spring-asm and inline ASM 4 into spring-core

Browse Source 
ASM 4.0 is generally compatibile with Java 7 classfiles, particularly
including 'invokedynamic' instructions. This is important when
considering that Spring's component-scanning support is internally
ASM-based and it is increasingly likely that component classes having
invokedynamic instructions may be encountered and read by ASM.
This upgrade, then, is primarily preventive in nature.

Changes include:

 - upgrade from ASM 2.2.3 to ASM 4.0

 - adapt to ASM API changes as necessary throughout spring-core,
   resulting in no impact to the public Spring API.

 - remove dedicated spring-asm module

 - use new :spring-core:asmRepackJar task to repackage
   org.objectweb.asm => org.springframework.asm as per usual and write
   repackaged classes directly into spring-core jar

The choice to eliminate the spring-asm module altogether and instead
inline the repackaged classes directly into spring-core is first to
eliminate an otherwise unnecessary second jar. spring-core has a
non-optional dependency on spring-asm meaning it is always on the
application classpath. This change simplifies that situation by
consoliding two jars into one. The second reason for this choice is in
anticipation of upgrading CGLIB to version 3 and inlining it into
spring-core as well. See subsequent commit for details.

Issue: SPR-9669
This commit is contained in:
Chris Beams
2012-08-07 13:16:00 +02:00
parent 69a392981e
commit c16f18a5fd
16 changed files with 161 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/dist/changelog.txt vendored
View File

@@ -36,6 +36,7 @@ Changes in version 3.2 M2 (2012-08-xx)
* introduced countRowsInTableWhere() and dropTables() in JdbcTestUtils (SPR-9235)
* introduced JdbcTemplate in tx base classes in the TestContext framework (SPR-8990)
* introduced countRowsInTableWhere() and dropTables() in tx base test classes (SPR-9665)
* inlined ASM 4.0 into spring-core, removed spring-asm subproject and jar (SPR-9669)
Changes in version 3.2 M1 (2012-05-28)

8
src/dist/license.txt vendored
View File

@@ -202,18 +202,18 @@
=======================================================================
SPRING FRAMEWORK 3.1 SUBCOMPONENTS:
SPRING FRAMEWORK 3.2 SUBCOMPONENTS:
Spring Framework 3.1 includes a number of subcomponents with
Spring Framework 3.2 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
conditions of the following licenses.
>>> asm-2.2.3:
>>> asm-4.0:
Copyright (c) 2000-2005 INRIA, France Telecom
Copyright (c) 2000-2011 INRIA, France Telecom
All rights reserved.
Redistribution and use in source and binary forms, with or without