Phillip Webb 1f52f09089 Backport "Ensure @Imports are processed in correct order" ...

Issue: SPR-9925
Backport-Commit: 3416e058a0
Conflicts:
	spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java

2013-01-22 15:17:46 +01:00

..

.settings

Merge 3.1.0 development branch into trunk

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

src

Backport "Ensure @Imports are processed in correct order"

2013-01-22 15:17:46 +01:00

.classpath

Upgrade to Hibernate Validator 4.2.0.Final

2011-12-09 13:09:11 +00:00

.project

Add hamcrest to spring-aspects Eclipse classpath

2012-07-06 15:52:00 +02:00

.springBeans

Remove "Feature" support introduced in 3.1 M1

2011-05-06 19:03:52 +00:00

build.xml

+ upgrade to AspectJ 1.6.8

2010-02-04 11:46:21 +00:00

context.iml

Convert CRLF=>LF on files missed earlier

2011-12-22 14:06:44 +01:00

ivy.xml

used specific SLF4J versions for running the test suites of individual modules (fixing the Hibernate Validator 4.2 upgrade)

2011-12-09 17:53:29 +00:00

pom.xml

Increment version to 3.1.4.BUILD-SNAPSHOT

2012-10-31 18:14:06 +01:00

template.mf

fixed OSGi metadata for optional "javax.inject" package import (SPR-9173)

2012-03-14 16:03:49 +01:00