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

23 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
Costin Leau feec66ab73 SPR-7197 
+ removed compile time dependency on JBoss VFS
+ added support for JBoss AS 6.0 / JBoss VFS 3.0.0 infrastructure

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3336 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-05-14 19:29:44 +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
David Syer 9b7928b808 SPR-5327: tidy up Maven dependencies (keeping commons-logging) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2548 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-30 12:56:25 +00:00
Keith Donald cd40d6c20d polish; fixed failed tests 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2235 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-10-30 19:19:27 +00:00
Keith Donald 9ea5a96bb5 default date/time converters 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2180 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-10-25 04:52:26 +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
Thomas Risberg 9809730148 fixed component scanning for JBoss 5 VFS; applied revised vfs-fixes-3.patch; added ResourceHandlingUtils (SPR-5120) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1864 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-09-10 10:35:04 +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
Mark Pollack da4f4ef034 POM maintenance/development - initial jarjar support in maven build for ASM 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1504 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-07-10 02:12:50 +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 f8adb82ab3 POM maintenance 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@861 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-03-27 21:28:51 +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 6c73f95dbc Added @Override annotations to core module 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@144 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-10-27 22:26:10 +00:00
Arjen Poutsma 5d22d0f586 Fixed manifest templates and pomx 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@113 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-10-23 08:38:18 +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