Merge remote-tracking branch 'upstream/master'

This commit is contained in:
WSSIA
2016-09-19 21:50:54 +01:00
104 changed files with 2345 additions and 1782 deletions

19
pom.xml
View File

@ -283,6 +283,25 @@
<ignore/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
com.github.markusmo3.urm
</groupId>
<artifactId>
urm-maven-plugin
</artifactId>
<versionRange>
[1.4.1,)
</versionRange>
<goals>
<goal>map</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>