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
15 years ago
4a60c50104
updated to Groovy 1.6.5
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2521 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
a65d974b14
initial JSR-330 injection support
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1894 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
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
17 years ago
a521abefcc
updated dependencies
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1791 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
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
17 years ago
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
17 years ago
ae464e40c6
[SPR-5888] Upgrading to TestNG 5.9.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1458 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
b5e0328914
updated to FreeMarker 2.3.15 (SPR-4962)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1031 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
8fe2a89d43
switched to use XInclude
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1001 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
acce93e0b3
updte hibernate dependencies in integration-test project to same as
...
those in orm project
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@982 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
65f0eb6db2
updated compile and test dependencies
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@694 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
0432420ba2
Added JUnit 4.5
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@659 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
b8b836ca43
added IntelliJ settings for integration-tests module
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@618 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
91d7b44c47
renamed .testsuite -> .integration-tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@492 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
77444b9dd3
fixed broken tests
...
+ added dependency on antlr 2.7.6, eliminating ClassNotFoundExceptions
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@358 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
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
17 years ago
c1377fb6ed
Added test and testsuite intellij projects.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@297 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
Chris Beams
Juergen Hoeller
Sam Brannen
Thomas Risberg
Colin Sampaleanu
Arjen Poutsma