spring-framework/org.springframework.oxm
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.
2010-10-25 19:48:20 +00:00
..
.settings 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. 2009-07-15 07:26:31 +00:00
src Merge 3.1.0 development branch into trunk 2010-10-25 19:48:20 +00:00
.classpath Rolled-back accidental .classpath changes 2010-05-14 16:23:48 +00:00
.project
build.xml + upgrade to AspectJ 1.6.8 2010-02-04 11:46:21 +00:00
castorbuilder.properties Added castor properties 2009-08-27 09:26:01 +00:00
ivy.xml Publishing license and notice files 2010-08-23 13:17:31 +00:00
oxm.iml SPR-6939 - XStreamMarshaller + JsonHierarchicalStreamDriver + JsonWriter.DROP_ROOT_MODE produce empty output 2010-03-09 09:53:51 +00:00
pom.xml Merge 3.1.0 development branch into trunk 2010-10-25 19:48:20 +00:00
template.mf + make use or property placeholders inside template.mf 2010-02-19 09:43:22 +00:00