root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
3,721 Commits 17 Branches 354 Tags 372 MiB
Commit Graph

14 Commits

Author SHA1 Message Date
Chris Beams 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
Juergen Hoeller 4a60c50104 updated to Groovy 1.6.5 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2521 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-27 01:37:43 +00:00
Juergen Hoeller 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
Juergen Hoeller 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
Juergen Hoeller 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
Sam Brannen 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
Sam Brannen 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
Sam Brannen 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
 2009-07-02 16:03:31 +00:00
Juergen Hoeller 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
 2009-04-19 22:22:56 +00:00
Thomas Risberg 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
Colin Sampaleanu 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
 2009-04-13 05:03:55 +00:00
Juergen Hoeller 65f0eb6db2 updated compile and test dependencies 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@694 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-25 13:42:45 +00:00
Arjen Poutsma 0432420ba2 Added JUnit 4.5 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@659 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-02-20 14:58:19 +00:00
Juergen Hoeller 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
 2009-02-12 22:12:27 +00:00