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
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
16 years ago
82e5f5f5d6
Publishing license and notice files
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3612 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
750dc01862
Prepping for 3.0.5
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3611 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
16 years ago
7f54fe732f
Upgrading version to 3.0.4
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3428 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
16 years ago
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
16 years ago
dbecde0bd1
Rolled-back accidental .classpath changes
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3335 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
16 years ago
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
16 years ago
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
16 years ago
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
16 years ago
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
16 years ago
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
16 years ago
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
16 years ago
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
16 years ago
0bd10c979a
Improved Jaxb2Marshaller.supports()
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2990 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
08092f34a6
Improved Jaxb2Marshaller.supports()
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2989 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
16 years ago
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
16 years ago
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
16 years ago
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
16 years ago
053730c5f7
+ add oxm.xsd namespace alias
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2515 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
95d9d471ce
SPR-6371 - Jaxb2Marshaller should use AnnotationUtils
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2446 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
e42cfe8e22
SWS-572
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2402 50f2f4bb-b051-0410-bef5-90022cba6387
16 years ago
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
17 years ago
b5e25453d2
pom maintenance
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1952 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
a521abefcc
updated dependencies
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1791 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
d0380c25d3
Removed duplicate OrderItem
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1780 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
2577b03d2e
More autoboxing madness.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1778 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
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
17 years ago
5612c24f11
Added castor properties
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1775 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
941b0602ba
SPR-6003 - Improve CastorMarshaller support for loading class descriptors
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1774 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
4c33a86340
SPR-6037 - Ability to configure a XStream subclass on XStreamMarshaller
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1761 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
e31d928f1d
SWS-548 - Expose suppressNamespace and suppressXSIType as properties to CastorMarshaller
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1733 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
07190d866b
pom maintenance - changes needed to run inside eclipse via m2eclipse
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1702 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
2f66da5293
SPR-5976 - Upgrade POMS to JUnit 4.6
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1696 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
6b93dec28f
Updating POMs to contain Junit & EasyMock version numbers. Apparently, the maven ant tasks cannot resolve our parent pom.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1674 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
e81fd7b5d3
xsds now use schemaLocation attribute on xsd:import elements to specify the concrete schema version to import
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1589 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
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
ead546b2f2
SPR-5803 and additional POM maintenance/development
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1503 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
aef72ba508
[SPR-5895] Upgraded to EasyMock 2.5.1.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1462 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
887f8b3c10
[SPR-5887] Upgraded to JUnit 4.6.0.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1461 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
dd0f2a666e
eclipse refactor changed code unexpectedly
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1420 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
1535d67b3c
naming improvements since design review
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1419 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
0ebfcc6952
SPR-5760 - XStreamMarshaller can not activate XStream automatic annotations detection feature
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1405 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
7cbb06100e
SPR-5838 - XstreamMarshaller does not support field aliasing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1404 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
1674b2eade
SPR-5745 - Support lazy initialization within Jaxb2 OXM classes
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1350 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
e9288fdb4e
SPR-5523: JAXB2 is using package-info.java now as well.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1299 50f2f4bb-b051-0410-bef5-90022cba6387
17 years ago
Chris Beams
Arjen Poutsma
Ben Hale
Juergen Hoeller
Luke Taylor
David Syer
Costin Leau
Mark Pollack
Christian Dupuis
Sam Brannen
Keith Donald