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
972492bfbb
made Excel tests work
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2289 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-07 01:32:18 +00:00
c50391a921
updated to final versions of JSR-330 and JSR-303 APIs
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2132 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-15 14:31:41 +00:00
4ba26dc632
added ".vm" as resource file extension
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2021 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 14:48:21 +00:00
51f64ea0c2
initial JSR-330 injection support
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1896 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-15 14:12:16 +00:00
f3606bf320
reworked PropertyPlaceholderHelper
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1848 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-08 19:09:12 +00:00
4354ffd683
updated to CGLIB 2.2 and EHCache 1.6.2
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1830 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-07 18:04:27 +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
72ad199618
Added Copyright plugin info
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1009 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-16 13:20:33 +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
afe9b1474d
added Groovy file settings
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@854 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-27 17:33:50 +00:00
142d9dbb78
updated code style settings
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@689 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-25 10:08:23 +00:00
c3cbe94385
updated for execution of integration tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@654 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-19 00:16:20 +00:00
d97e70b85e
always use static imports with '*'
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@650 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-17 19:10:35 +00:00
2cc90393aa
prepared for 3.0 M2 release
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@644 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-16 01:51:18 +00:00
91d7b44c47
renamed .testsuite -> .integration-tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@492 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-20 09:36:46 +00:00
99c1bfd7fb
updated changelog
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@353 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-05 07:25:33 +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
0b0163e026
Java 5 code style
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@331 50f2f4bb-b051-0410-bef5-90022cba6387
2008-11-25 01:29:54 +00:00
3a2cc21084
added script resources
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@323 50f2f4bb-b051-0410-bef5-90022cba6387
2008-11-20 23:54:00 +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
a23356a4eb
Intellij projects
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@251 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-31 17:43:22 +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
1057bfccf5
Added IntelliJ project
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@170 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-28 14:15:25 +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
Arjen Poutsma
Thomas Risberg