spring-framework

3983 Commits

17 Branches

357 Tags

349 MiB

Tree: 11c31085fe

Commit Graph

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	15 years ago
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	17 years ago
Scott Andrews	88cb99e377	adding eclipse settings for org.springframework.aspects git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@164 50f2f4bb-b051-0410-bef5-90022cba6387	18 years ago

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

15 years ago

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

17 years ago

Scott Andrews

88cb99e377

adding eclipse settings for org.springframework.aspects

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@164 50f2f4bb-b051-0410-bef5-90022cba6387

18 years ago

3 Commits (11c31085fec5c8da27f6a3965cd93f8127745864)