Juergen Hoeller fd10e149f6 Backport "Remove default profile during environment merge" ...

Issue: SPR-9761
Issue: SPR-9762

2012-10-11 00:30:00 +02:00

..

.settings

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

src

Backport "Remove default profile during environment merge"

2012-10-11 00:30:00 +02:00

.classpath

Resolve nested placeholders via PropertyResolver

2012-07-06 19:42:54 +02:00

.project

Added Eclipse project dependency on org.springframework.asm

2011-05-23 17:18:14 +00:00

build.xml

Added DomUtils.getChildElements() method. Also refactored ConfigBeanDefinitionParser.parse() to use it.

2010-05-14 16:07:39 +00:00

core.iml

added Hamcrest dependency to core module

2012-08-30 16:30:46 +02:00

ivy.xml

Resolve nested placeholders via PropertyResolver

2012-07-06 19:42:54 +02:00

pom.xml

Increment version to 3.1.3.BUILD-SNAPSHOT

2012-07-07 20:05:06 +02:00

template.mf

Introduce CommandLinePropertySource and impls

2011-06-30 22:33:56 +00:00