diff --git a/.springBeans b/.springBeans index c4469cbf0fc3825855fef1497fb65f31625abb9b..44f18becd89552729b3740f4b5be69fc45eae9bf 100644 --- a/.springBeans +++ b/.springBeans @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <beansProjectDescription> <version>1</version> - <pluginVersion><![CDATA[3.2.0.201301251408-M2]]></pluginVersion> + <pluginVersion><![CDATA[3.5.0.201404011509-RELEASE]]></pluginVersion> <configSuffixes> <configSuffix><![CDATA[xml]]></configSuffix> </configSuffixes> @@ -12,6 +12,9 @@ <config>src/main/resources/spring/mvc-view-config.xml</config> <config>src/main/resources/spring/business-config.xml</config> </configs> + <autoconfigs> + <config>src/main/resources/spring/tools-config.xml</config> + </autoconfigs> <configSets> </configSets> </beansProjectDescription> diff --git a/pom.xml b/pom.xml index e43175cf9b123a3fcfe41a34c4ed13125b3032cc..4cece52660594f373bbdfbaeab6576d0a193192e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- Spring --> - <spring-framework.version>4.0.5.RELEASE</spring-framework.version> - <spring-data-jpa.version>1.6.1.RELEASE</spring-data-jpa.version> + <spring-framework.version>4.0.6.RELEASE</spring-framework.version> + <spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version> <!-- Java EE / Java SE dependencies --> @@ -27,7 +27,7 @@ <jaxb-impl.version>2.2.7</jaxb-impl.version> <!-- Hibernate / JPA --> - <hibernate.version>4.3.5.Final</hibernate.version> + <hibernate.version>4.3.6.Final</hibernate.version> <!-- Bean validation --> <hibernate-validator.version>4.3.1.Final</hibernate-validator.version> @@ -54,8 +54,8 @@ <!-- Dates --> <jodatime-hibernate.version>1.3</jodatime-hibernate.version> <jodatime-jsptags.version>1.1.1</jodatime-jsptags.version> - <jodatime.version>2.3</jodatime.version> - <jadira-usertype-core.version>3.1.0.GA</jadira-usertype-core.version> + <jodatime.version>2.4</jodatime.version> + <jadira-usertype-core.version>3.2.0.GA</jadira-usertype-core.version> <!-- Web dependencies --> @@ -81,23 +81,23 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>jstl-impl</artifactId> - <version>1.2</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>jstl-impl</artifactId> + <version>1.2</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> @@ -310,9 +310,7 @@ <artifactId>datatables-export-itext</artifactId> <version>${dandelion.version}</version> </dependency> - </dependencies> - <dependencyManagement> <dependencies> <!--