mindol1004/spring-soap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
Sjmillington
2019-11-02 12:51:10 +00:00
parent 97de755d75 7940f0d912
commit d2fd54fd32
703 changed files with 10278 additions and 6865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-rest-full/pom.xml
View File

@@ -125,6 +125,7 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>${xml-apis.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
@@ -284,6 +285,7 @@
<properties>
<!-- various -->
<xstream.version>1.4.9</xstream.version>
<xml-apis.version>1.4.01</xml-apis.version>
<!-- util -->
<guava.version>19.0</guava.version>
@@ -294,4 +296,4 @@
<apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
</properties>
</project>
</project>