spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 21:39:05 +00:00
Code Issues Projects Releases Wiki Activity
3,654 Commits 18 Branches 368 Tags
c2996bebcdff5db40f89e396bc34b7c2829ee9ec
Commit Graph
15 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
Arjen Poutsma 750dc01862 Prepping for 3.0.5 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3611 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-08-19 11:04:04 +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
David Syer faa0f29f0f Update version in POMs to 3.0.3 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3246 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-04-15 10:26:14 +00:00
David Syer 25ef81476d Update Central POMs to 3.0.2 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3022 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-02-21 15:32:18 +00:00
Costin Leau 5e677feda0 + upgrade to AspectJ 1.6.8 
+ externalize some of the jar versions
+ align the versions of some dependencies between pom.xml and ivy.xml

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2918 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-02-04 11:46:21 +00:00
Ben Hale d5bdca4f23 Fixed up POM bug 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2858 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-01-23 12:01:54 +00:00
David Syer e6d2f9428c SPR-6678: fix poms for 3.0.1 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2809 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-01-13 11:07:08 +00:00
Mark Pollack b5e25453d2 pom maintenance 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1952 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-09-21 07:37:30 +00:00
Mark Pollack 2f66da5293 SPR-5976 - Upgrade POMS to JUnit 4.6 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1696 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-08-05 17:48:53 +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
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
Mark Pollack 5f3ac321cb Change version from 3.0.0.M3 to 3.0.0.BUILD-SNAPSHOT (again) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@959 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-04-09 14:38:35 +00:00
Mark Pollack f39cb005f6 SPR-5385, SPR-5301 - initial pass completed of POMs for maven central repository upload. N.B. Can not build spring with these POMs. 
Cleanup remains to meet maven central metadata requirements

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@816 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-25 08:06:34 +00:00
Chris Beams 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