iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spring updates

Browse Source
This commit is contained in:
eugenp
2014-09-15 14:26:17 +03:00
parent 7da44d2140
commit 1e36d212d1
53 changed files with 87 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rest-testing/pom.xml
+5 -5
View File
@@ -138,7 +138,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.0.3.RELEASE</org.springframework.version>
<org.springframework.version>4.1.0.RELEASE</org.springframework.version>
<!-- marshalling -->
<jackson.version>2.4.2</jackson.version>
@@ -151,8 +151,8 @@
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
<!-- util -->
<guava.version>16.0.1</guava.version>
<commons-lang3.version>3.3</commons-lang3.version>
<guava.version>18.0</guava.version>
<commons-lang3.version>3.3.2</commons-lang3.version>
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
@@ -167,9 +167,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
</properties>
rest-testing/src/main/webapp/WEB-INF/api-servlet.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd" >
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" >
</beans>