Chris Beams
391c4cd67a
Update pom and .classpath to reflect Castor upgrade
...
Issue: SPR-8341 SPR-8453
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4558 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-16 04:36:53 +00:00
Arjen Poutsma
d9f6dcf6b4
Ignoring test failing on build server, though it works locally. No idea why.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4553 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-15 12:26:43 +00:00
Arjen Poutsma
f09ac3ce82
SPR-8453 - SpringOXM CastorMarshaller tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4552 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-15 11:45:23 +00:00
Arjen Poutsma
bd8efc1240
Minor changes
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4551 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-15 11:13:04 +00:00
Arjen Poutsma
aad920d164
SPR-8341 - Spring OXM CastorMarshaller unmarshalling methods
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4550 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-15 11:09:58 +00:00
Arjen Poutsma
7ffabfaba7
SPR-8453 - SpringOXM CastorMarshaller tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4549 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-15 11:04:02 +00:00
Arjen Poutsma
09322ae5d8
Upgrade to Castor 1.3.2
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4548 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-15 10:52:16 +00:00
Arjen Poutsma
dc80cad45c
Upgrade to Castor 1.3.2
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4547 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-15 10:39:04 +00:00
Arjen Poutsma
a93f8b8da6
Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4546 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-15 10:37:58 +00:00
Arjen Poutsma
a285d2daec
SPR-8309 - Spring OXM schema improvement for CastorMarshaller
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4537 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 13:46:32 +00:00
Arjen Poutsma
fdb834bd27
SPR-7931 - Checking for @XmlRootElement annotation should be made optional in Jaxb2Marshaller
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4534 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 09:46:18 +00:00
Juergen Hoeller
03adc3b632
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)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4502 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 09:58:15 +00:00
Arjen Poutsma
bd4a08df62
SPR-8296 - Extension for CastorMarshaller - additional unmarshaller properties
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4330 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-19 14:01:35 +00:00
Arjen Poutsma
84f00122b6
SPR-8295 - Extension for CastorMarshaller - additional marshaller properties
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4329 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-19 13:34:36 +00:00
Arjen Poutsma
0dd43ab107
SPR-7805 - Add support for package binding in the JibxMashaller
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4169 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-04 08:50:15 +00:00
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
Sam Brannen
924b8e11ea
[SPR-7850][SPR-7851] Upgraded to JUnit 4.8.1 and TestNG 5.12.1; added changelog entries for 3.1.0.M1.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3838 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-30 08:00:58 +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
Arjen Poutsma
a95297e787
SPR-7636 - XStreamMarshaller - Add support for configuring XStream with aliases by class (type) and also defining multiple attributes for the same class.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3747 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 11:55:29 +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
Juergen Hoeller
b5194916cd
Jaxb2Marshaller's "marshallerProperties" Map accepts any value type (SPR-7292)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3430 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-20 18:28:07 +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
Arjen Poutsma
d589f8e8d5
SPR-7263 - TypeMismatchException instead of IllegalArgumentException: argument type mismatch for wrong RequestBody
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3405 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-09 10:35:41 +00:00
Arjen Poutsma
a7c08688e8
SPR-7257 - AbstractMarshaller incorrectly expects DOMResult to already have a node
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3380 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-07 13:15:07 +00:00
Luke Taylor
dbecde0bd1
Rolled-back accidental .classpath changes
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3335 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-14 16:23:48 +00:00
Luke Taylor
ed0eecff4b
Added DomUtils.getChildElements() method. Also refactored ConfigBeanDefinitionParser.parse() to use it.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3334 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-14 16:07:39 +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
Arjen Poutsma
66226b8209
SPR-7034 - XmlBeans UnMarshalling - does not work with RequestBody annotation
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3172 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-25 11:52:32 +00:00
Arjen Poutsma
13383fc828
SPR-6939 - XStreamMarshaller + JsonHierarchicalStreamDriver + JsonWriter.DROP_ROOT_MODE produce empty output
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3068 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-09 09:53:51 +00:00
Arjen Poutsma
f82f42815d
SPR-6907 - JibxMarshaller - provide access to jibx's writeDocType
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3042 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-02 12:49:31 +00:00
Arjen Poutsma
be8fd2857c
SPR-6907 - JibxMarshaller - provide access to jibx's writeDocType
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3041 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-02 11:56:22 +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
4be6044db9
+ make use or property placeholders inside template.mf
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3014 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-19 09:43:22 +00:00
Arjen Poutsma
0bd10c979a
Improved Jaxb2Marshaller.supports()
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2990 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-16 14:25:55 +00:00
Arjen Poutsma
08092f34a6
Improved Jaxb2Marshaller.supports()
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2989 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-16 14:13: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
Arjen Poutsma
619134054a
SPR-6577 - MarshallingView auto detect model with Jaxb2Marshaller chooses the wrong object
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2866 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-27 10:52:08 +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
David Syer
2bad74c238
SPR-5327: tweak the ivy.xml so that commons-logging is a separate configuration. It already comes out as optional in the generated poms (including core), which isn't great, but I can't see what is causing that
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2579 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-04 18:25:31 +00:00
Costin Leau
053730c5f7
+ add oxm.xsd namespace alias
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2515 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-26 15:44:29 +00:00
Arjen Poutsma
95d9d471ce
SPR-6371 - Jaxb2Marshaller should use AnnotationUtils
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2446 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-18 14:02:29 +00:00
Arjen Poutsma
e42cfe8e22
SWS-572
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2402 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-12 16:09:08 +00:00
Mark Pollack
4e2aaf7934
SPR-6119 - Add slf4j dependency back to orm's pom.xml but in test scope as it is needed to run tests that use Hibernate
...
SPR-5956 - Remove commons-logging dependency definitions in pom.xml for all but spring-core so as to make exclusion rule easier for user who use slf4j
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2001 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 05:16:55 +00:00
Mark Pollack
b5e25453d2
pom maintenance
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1952 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 07:37:30 +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
Arjen Poutsma
d0380c25d3
Removed duplicate OrderItem
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1780 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-27 13:51:47 +00:00
Arjen Poutsma
2577b03d2e
More autoboxing madness.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1778 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-27 10:30:47 +00:00
Juergen Hoeller
b8afb2ef56
added superfluous cast to get around ambiguity problem with some compilers
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1777 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-27 10:23:04 +00:00
Arjen Poutsma
5612c24f11
Added castor properties
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1775 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-27 09:26:01 +00:00