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,874 Commits 17 Branches 354 Tags 372 MiB
Commit Graph

16 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
Ben Hale 82e5f5f5d6 Publishing license and notice files 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3612 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-08-23 13:17:31 +00:00
Arjen Poutsma cdac541cac Prepping for 3.0.5 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3610 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-08-19 10:55:41 +00:00
Arjen Poutsma 7f54fe732f Upgrading version to 3.0.4 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3428 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-06-15 14:18:29 +00:00
Arjen Poutsma 37633cad7e Updated to version 3.0.3 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3226 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-04-02 13:12:58 +00:00
Costin Leau 9a5e75861d + improve template for spring-context so that the import-package is updated automatically 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3037 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-02-25 15:46:54 +00:00
Costin Leau 4be6044db9 + make use or property placeholders inside template.mf 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3014 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-02-19 09:43:22 +00:00
Arjen Poutsma 93f33214f3 setting things up for 3.0.2 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3010 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-02-18 17:42:14 +00:00
Arjen Poutsma 855a8be626 Updated build for 3.0.1 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2691 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-12-17 10:53:15 +00:00
Rob Harrop b98d52b16b [SPR-3635] [SPR-5039] [SPR-5813] JMX annotation inheritance fixed 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1852 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-09-08 21:37:02 +00:00
Arjen Poutsma 7f0cc2031a Removed ci.build=true 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1727 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-08-10 09:00:11 +00:00
Costin Leau 92bffc2fb5 + fixed exception unwrapping 
+ optimized path for getBean (and thus fixed another test)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1707 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-08-06 19:08:14 +00:00
Ben Hale ab0d2d3b89 Split the compile and test-compile macros. Added a pre-compile macro. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@542 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-01-14 16:29:33 +00:00
Ben Hale 488d109d9d Added max memory for javadoc vm 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@241 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-10-31 09:39:17 +00:00
Ben Hale 5e45b9b71c spring-build updates 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@131 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-10-25 18:30:33 +00:00
Ben Hale 860a8a3f15 Initial code checkin 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-07-11 06:34:50 +00:00