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

19 Commits

Author SHA1 Message Date
Sam Brannen 924b8e11ea [SPR-7850][SPR-7851] Upgraded to JUnit 4.8.1 and TestNG 5.12.1; added changelog entries for 3.1.0.M1. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3838 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-12-30 08:00:58 +00:00
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 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
Thomas Risberg 818a21b477 added com.springsource.javax.servlet.jsp dependency to fix problem with test (SPR-7033) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3166 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-24 23:24:16 +00:00
Thomas Risberg 61003247b9 added conf attribute for the struts dependency (SPR-7033) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3164 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-24 22:39:47 +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 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
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 4f63cc58a4 Updates to allow nightly snapshots of maven central-compatible artifacts 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2854 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-01-22 20:16:25 +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 2bad74c238 SPR-5327: tweak the ivy.xml so that commons-logging is a separate configuration. It already comes out as optional in the generated poms (including core), which isn't great, but I can't see what is causing that 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2579 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-12-04 18:25:31 +00:00
Chris Beams 2d0a6d1db8 SPR-5529: removed package.html files 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2280 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-06 23:15:35 +00:00
Chris Beams 68ddf0e1dc SPR-5523: converted a few additional package.html artifacts to package-info.java 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2279 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-06 23:13:15 +00:00
Sam Brannen fa6d8b7fc2 Added Eclipse project settings for the new web.struts module. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2134 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-10-15 23:24:38 +00:00
Arjen Poutsma 5a523a78bb SPR-6236: Reintroduce Struts support 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2131 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-10-15 14:04:13 +00:00
Arjen Poutsma e7a64524da SPR-6236: Reintroduce Struts support 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2127 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-10-15 10:31:47 +00:00