45e5b46fc2
Merge 3.1.0 development branch into trunk
...
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:
git merge -s recursive -Xtheirs --no-commit env
No merge conflicts, but did need to
git rm spring-build
prior to committing.
With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch. 3.1.0 snapshots will be available
per the usual nightly CI build from trunk.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3782 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-25 19:48:20 +00:00
a65d974b14
initial JSR-330 injection support
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1894 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-15 12:00:55 +00:00
4d0b327678
[SPR-6017] updated DBDR and BDPD to allow for overriding of namespace-specific methods
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1820 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-04 18:22:37 +00:00
a521abefcc
updated dependencies
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1791 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-31 11:25:54 +00:00
aef72ba508
[SPR-5895] Upgraded to EasyMock 2.5.1.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1462 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-03 09:32:15 +00:00
887f8b3c10
[SPR-5887] Upgraded to JUnit 4.6.0.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1461 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-02 18:07:55 +00:00
8fe2a89d43
switched to use XInclude
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1001 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-14 21:37:40 +00:00
f388e47598
consistent compilation against Servlet 2.5, JSP 2.1 and JUnit 4.5
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@345 50f2f4bb-b051-0410-bef5-90022cba6387
2008-11-27 21:49:10 +00:00
a5253bec7f
EL container integration; support for contextual objects; removal of deprecated Spring 2.0 functionality; Java 5 code style
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@305 50f2f4bb-b051-0410-bef5-90022cba6387
2008-11-20 02:10:53 +00:00
1e7f22bf9d
Updated projects and ivy.xmls
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@291 50f2f4bb-b051-0410-bef5-90022cba6387
2008-11-17 15:09:17 +00:00
06c84a4bec
IntelliJ projects
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@204 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-29 18:29:36 +00:00
b9a3ef8969
Added IntelliJ projects
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@163 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-28 12:28:35 +00:00
Chris Beams
Juergen Hoeller
Rob Harrop
Sam Brannen
Thomas Risberg
Arjen Poutsma