zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Spring version.

Browse Source 
Fix failing export tests
This commit is contained in:
Paulo Veiga
2018-09-14 17:50:27 -07:00
parent 57b2e79c0d
commit 4234ca7e38
30 changed files with 187 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wise-webapp/pom.xml
View File

@@ -110,7 +110,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.2</version>
<version>1.7.25</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -145,8 +145,14 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>2.1.4</version>
<version>2.2.2</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -280,7 +286,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
<version>1.7.25</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -289,12 +295,6 @@
<version>2.10.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.tanesha.recaptcha4j</groupId>
<artifactId>recaptcha4j</artifactId>
<version>0.0.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<!-- jsoup HTML parser library @ http://jsoup.org/ -->
<groupId>org.jsoup</groupId>
@@ -316,7 +316,16 @@
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<version>4.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
</dependency>
</dependencies>
<profiles>
<profile>
@@ -561,9 +570,9 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>8.1.14.v20131031</version>
<version>9.4.12.v20180830</version>
<configuration>
<baseAppFirst>false</baseAppFirst>
<stopKey>foo</stopKey>