Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2016-11-18 17:30:03 -08:00
34 changed files with 301 additions and 129 deletions

View File

@@ -1,5 +1,4 @@
<?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<?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" 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>
<parent>
@@ -60,8 +59,8 @@
<phase>package</phase>
<configuration>
<target>
<property name="build.compiler" value="extJavac" />
<ant dir="${basedir}" />
<property name="build.compiler" value="extJavac"/>
<ant dir="${basedir}"/>
</target>
</configuration>
<goals>
@@ -101,4 +100,4 @@
</plugin>
</plugins>
</build>
</project>
</project>