Commit Graph

26 Commits

Author SHA1 Message Date
Chris Beams adc9400905 Include license.txt and notice.txt in module JARs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3967 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-09 06:56:40 +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
Juergen Hoeller a3d4fb65b5 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3771 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-15 20:50:51 +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
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
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
Juergen Hoeller 599910699a fixed overview files
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2005 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 08:47:18 +00:00
Juergen Hoeller a521abefcc updated dependencies
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1791 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-31 11:25:54 +00:00
Chris Beams b33d28d6cf updated .jms dependency on junit 4.6.0 from test->runtime to test->compile. touched all org.eclipse.jdt.core.prefs (during the process of importing the projects). only the date comments within each have changed.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1541 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-15 07:26:31 +00:00
Thomas Risberg 8fe2a89d43 switched to use XInclude
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1001 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-14 21:37:40 +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
Chris Beams 2796c55974 Whitespace polishing: leading spaces->tabs; updated eclipse configuration to default to leading tabs for all bundles
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@464 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-18 14:50:25 +00:00
Juergen Hoeller a5253bec7f EL container integration; support for contextual objects; removal of deprecated Spring 2.0 functionality; Java 5 code style
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@305 50f2f4bb-b051-0410-bef5-90022cba6387
2008-11-20 02:10:53 +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
Arjen Poutsma 06c84a4bec IntelliJ projects
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@204 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-29 18:29:36 +00:00
Arjen Poutsma b9a3ef8969 Added IntelliJ projects
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@163 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-28 12:28:35 +00:00
Arjen Poutsma 7716be3f4a Changed project from agent to instrument
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@151 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-27 23:39:42 +00:00
Scott Andrews ea21bb3114 adding eclipse project settings
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@138 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-27 15:48:40 +00:00
Arjen Poutsma 29caa8731b Moved agent to instrument
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@136 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-27 13:41:19 +00:00