+ add default servlet definition (for containers that do not declare it - such as GlassFish)

+ increase Spring version to RC3 (it works with trunk just fine)
This commit is contained in:
Costin Leau 2009-12-10 20:49:35 +00:00 committed by Mic
parent d8b7615705
commit fe63e9c87f
2 changed files with 198 additions and 165 deletions

22
pom.xml
View file

@ -8,7 +8,7 @@
<packaging>war</packaging>
<version>1.0.0-SNAPSHOT</version>
<properties>
<spring.version>3.0.0.RC2</spring.version>
<spring.version>3.0.0.RC3</spring.version>
<slf4j.version>1.5.6</slf4j.version>
</properties>
<dependencies>
@ -73,12 +73,24 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
<version>1.6.3.RELEASE</version>
<version>1.6.5.RELEASE</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate</artifactId>
<version>3.3.1.GA</version>
<artifactId>hibernate</artifactId>
<version>3.2.7.ga</version>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
<!--
<exclusion>
<groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId>
</exclusion>
-->
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@ -222,8 +234,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<verbose>true</verbose>
<source>1.5</source>
<target>1.5</target>
<showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>