Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x' into 2.0.x

Browse Source
This commit is contained in:
Phillip Webb
2018-05-30 12:18:38 -07:00
parent 09fa1e7e11 4d84933ee4
commit e38d5f910b
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-samples/pom.xml
View File

@@ -15,7 +15,7 @@
<properties>
<main.basedir>${basedir}/..</main.basedir>
<java.version>1.8</java.version>
<spring-javaformat.version>0.0.1</spring-javaformat.version>
<spring-javaformat.version>0.0.2</spring-javaformat.version>
</properties>
<modules>
<module>spring-boot-sample-ant</module>

5
spring-boot-samples/spring-boot-sample-ant/pom.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- This POM is just to trigger the Ant/Ivy sample from Maven and to test -->
<modelVersion>4.0.0</modelVersion>
@@ -103,4 +104,4 @@
</plugin>
</plugins>
</build>
</project>
</project>