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

121 Commits

Author SHA1 Message Date
Spring Buildmaster 63bff1f068 Increment version to 3.1.5.BUILD-SNAPSHOT 2013-01-23 15:00:13 +01:00
Spring Buildmaster e7d2ac4427 Release version 3.1.4.RELEASE 2013-01-23 14:58:18 +01:00
Chris Beams acd268e48f Fix broken Castor URLs in ref docs and mapping XML 
Issue: SPR-10189
Backport-Commit: d40c8cf

Conflicts:
	spring-framework-reference/src/oxm.xml
 2013-01-21 11:29:42 +01:00
Chris Beams 418c2a8641 Add spring-oxm-1.5.xsd 
Issue: SPR-10121
Backport-Commit: 3724b90a8f
 2012-12-26 09:39:08 +01:00
Spring Buildmaster e0b29b708c Increment version to 3.1.4.BUILD-SNAPSHOT 2012-10-31 18:14:06 +01:00
Spring Buildmaster 6c36240055 Release version 3.1.3.RELEASE 2012-10-31 18:12:45 +01:00
Juergen Hoeller 682b0f2c63 Jaxb2Marshaller has non-synchronized access to the JAXBContext once initialized 
Also backporting "checkForXmlRootElement" property from 3.2 M2

Issue: SPR-9867
Issue: SPR-9757
 2012-10-11 22:31:48 +02:00
Juergen Hoeller 3f48c71c77 Backported recent Jaxb2Marshaller changes 
Issue: SPR-9152
 2012-08-28 19:41:39 +02:00
Spring Buildmaster 671f97721f Increment version to 3.1.3.BUILD-SNAPSHOT 2012-07-07 20:05:06 +02:00
Spring Buildmaster 49f728eae8 Release version 3.1.2.RELEASE 2012-07-07 17:13:55 +02:00
Juergen Hoeller 100fa178dd XStreamMarshaller should convert XStream StreamException to Spring exception in case of unmarshalling an empty stream. 
Issue: SPR-9536
 2012-06-28 17:43:39 +02:00
Spring Buildmaster b32a365f14 Increment version to 3.1.2.BUILD-SNAPSHOT 2012-02-16 15:38:16 -08:00
Spring Buildmaster 79c9ca1a26 Release version 3.1.1.RELEASE 2012-02-16 15:33:27 -08:00
Chris Beams 87a021d5c9 Add <license> section to 3.1.x Maven poms 
Issue: SPR-8927
 2012-01-31 15:18:05 +01:00
Arjen Poutsma 79f32c7f33 SPR-8986 Add the ability to Scan Packages for JAXB Marshalling 
Jaxb2Marshaller now has the capability to scan for classes annotated with JAXB2 annotations.
 2012-01-20 16:25:33 +01:00
Arjen Poutsma ab6a7e8e74 Polishing 2012-01-11 11:48:20 +01:00
Chris Beams 88913f2b23 Convert CRLF (dos) to LF (unix) 
Prior to this change, roughly 5% (~300 out of 6000+) of files under the
source tree had CRLF line endings as opposed to the majority which have
LF endings.

This change normalizes these files to LF for consistency going forward.

Command used:

$ git ls-files | xargs file | grep CRLF | cut -d":" -f1 | xargs dos2unix

Issue: SPR-5608
 2011-12-21 14:52:47 +01:00
Chris Beams e158f61e93 Increment version to 3.1.1.BUILD-SNAPSHOT 2011-12-16 11:59:06 +01:00
Chris Beams ac107d0c2a Release Spring Framework 3.1.0.RELEASE 2011-12-13 16:35:49 +00:00
Juergen Hoeller d8e640d708 polishing 2011-12-11 22:07:12 +00:00
Arjen Poutsma 29e969039d SPR-8349 - Ability to specify ResourceResolver property for SchemaFactory in Jaxb2Marshaller 2011-12-07 00:56:03 +00:00
Sam Brannen 1de71c6e37 [SPR-8222] Upgraded to JUnit 4.9. 2011-08-30 13:16:12 +00:00
Sam Brannen 87dad65ff0 [SPR-8622] Upgraded to JUnit 4.8.2 2011-08-18 16:06:31 +00:00
Juergen Hoeller 5521f86f4a removed unused Servlet dependency 2011-07-28 20:27:04 +00:00
Chris Beams 2aaf14e96f Update pom and .classpath to reflect Castor upgrade 
Issue: SPR-8341 SPR-8453
 2011-06-16 04:36:53 +00:00
Arjen Poutsma 5c6bd2a1b6 Ignoring test failing on build server, though it works locally. No idea why. 2011-06-15 12:26:43 +00:00
Arjen Poutsma deca69e374 SPR-8453 - SpringOXM CastorMarshaller tests 2011-06-15 11:45:23 +00:00
Arjen Poutsma 35aa378527 Minor changes 2011-06-15 11:13:04 +00:00
Arjen Poutsma 680f9692c8 SPR-8341 - Spring OXM CastorMarshaller unmarshalling methods 2011-06-15 11:09:58 +00:00
Arjen Poutsma 3b1190121f SPR-8453 - SpringOXM CastorMarshaller tests 2011-06-15 11:04:02 +00:00
Arjen Poutsma 0346fbc154 Upgrade to Castor 1.3.2 2011-06-15 10:52:16 +00:00
Arjen Poutsma 6d45e1bb12 Upgrade to Castor 1.3.2 2011-06-15 10:39:04 +00:00
Arjen Poutsma 352d61bef2 Javadoc 2011-06-15 10:37:58 +00:00
Arjen Poutsma 9765fefeac SPR-8309 - Spring OXM schema improvement for CastorMarshaller 2011-06-14 13:46:32 +00:00
Arjen Poutsma 01d2082090 SPR-7931 - Checking for @XmlRootElement annotation should be made optional in Jaxb2Marshaller 2011-06-14 09:46:18 +00:00
Juergen Hoeller c60511bf04 shortened build properties "org.junit.version" to "junit.version" and "org.testng.version" to "testng.version"; reverted SLF4J version back to 1.5.3 (for Hibernate 3.3.1 compatibility) 2011-06-09 09:58:15 +00:00
Arjen Poutsma 60aa598c03 SPR-8296 - Extension for CastorMarshaller - additional unmarshaller properties 2011-05-19 14:01:35 +00:00
Arjen Poutsma dd8a9cce05 SPR-8295 - Extension for CastorMarshaller - additional marshaller properties 2011-05-19 13:34:36 +00:00
Arjen Poutsma fa4f90e648 SPR-7805 - Add support for package binding in the JibxMashaller 2011-04-04 08:50:15 +00:00
Chris Beams 2f7c2230f0 Include license.txt and notice.txt in module JARs 2011-02-09 06:56:40 +00:00
Sam Brannen b130a36af7 [SPR-7850][SPR-7851] Upgraded to JUnit 4.8.1 and TestNG 5.12.1; added changelog entries for 3.1.0.M1. 2010-12-30 08:00:58 +00:00
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
Arjen Poutsma 043ec2c8b2 SPR-7636 - XStreamMarshaller - Add support for configuring XStream with aliases by class (type) and also defining multiple attributes for the same class. 2010-10-12 11:55:29 +00:00
Ben Hale 7730e76c06 Publishing license and notice files 2010-08-23 13:17:31 +00:00
Arjen Poutsma dbfa049e1e Prepping for 3.0.5 2010-08-19 11:04:04 +00:00
Juergen Hoeller 5e5a8a09cf Jaxb2Marshaller's "marshallerProperties" Map accepts any value type (SPR-7292) 2010-06-20 18:28:07 +00:00
Arjen Poutsma b31c34ed7d Upgrading version to 3.0.4 2010-06-15 14:18:29 +00:00
Arjen Poutsma 723f94fd0e SPR-7263 - TypeMismatchException instead of IllegalArgumentException: argument type mismatch for wrong RequestBody 2010-06-09 10:35:41 +00:00
Arjen Poutsma f72c431e8a SPR-7257 - AbstractMarshaller incorrectly expects DOMResult to already have a node 2010-06-07 13:15:07 +00:00
Luke Taylor 27be8434f1 Rolled-back accidental .classpath changes 2010-05-14 16:23:48 +00:00