src-spring-framework

4231 Commits

19 Branches

274 Tags

318 MiB

Tree: ac7d48e5a8

Commit Graph

Author	SHA1	Message	Date
Chris Beams	f480333d31	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.	14 years ago
Chris Beams	9163d8043b	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.	16 years ago
Scott Andrews	a6984e2cdc	adding eclipse settings for org.springframework.aspects	16 years ago

Author

SHA1

Message

Date

Chris Beams

f480333d31

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.

14 years ago

Chris Beams

9163d8043b

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.

16 years ago

Scott Andrews

a6984e2cdc

adding eclipse settings for org.springframework.aspects

16 years ago

3 Commits (ac7d48e5a873e21ec0d0a068dfbd910a156f1313)