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

18 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
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 4e2aaf7934 SPR-6119 - Add slf4j dependency back to orm's pom.xml but in test scope as it is needed to run tests that use Hibernate 
SPR-5956 - Remove commons-logging dependency definitions in pom.xml for all but spring-core so as to make exclusion rule easier for user who use slf4j

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2001 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-09-25 05:16:55 +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
Arjen Poutsma 6b93dec28f Updating POMs to contain Junit & EasyMock version numbers. Apparently, the maven ant tasks cannot resolve our parent pom. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1674 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-08-03 09:21:44 +00:00
Andy Clement 7be642e5ec per Ramnivas' suggestion, removing this bit to try and fix snapshot builds 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1649 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-07-28 22:03:09 +00:00
Mark Pollack ead546b2f2 SPR-5803 and additional POM maintenance/development 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1503 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-07-09 19:38:07 +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 9feacc0375 Change version from 3.0.0.M3 to 3.0.0.BUILD-SNAPSHOT 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@919 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-04-03 14:03:48 +00:00
Mark Pollack f17f9ef0f5 POM maintenance 
Place parent pom in publicly accessible directory (org.sf.spring-parent).  
Create a component list pom in org.sf.spring-library.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@868 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-29 09:56:38 +00:00
Mark Pollack 4f514aac1e SPR-5385, SPR-5301 - partial work committed. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@811 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-24 05:56:56 +00:00
Arjen Poutsma 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
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