Chris Beams 05d10a5dac Merge branch '3.1.x'

2011-12-22 14:55:10 +01:00

..

.settings

Merge 3.1.0 development branch into trunk

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

src

Parse cache:annotation-driven key-generator attribute

2011-12-22 14:50:45 +01:00

.classpath

Upgrade to Hibernate Validator 4.2.0.Final

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

.project

Convert CRLF=>LF on files missed earlier

2011-12-22 14:06:44 +01: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.1.BUILD-SNAPSHOT

2011-12-16 11:59:06 +01:00

template.mf

cleanup of conversation dependencies

2011-10-20 09:56:07 +00:00