Merge branch '1.4.x' into 1.5.x

pull/6988/head
Andy Wilkinson 8 years ago
commit 8971c8ba54

@ -48,29 +48,6 @@
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<executions>
<execution>
<id>include-git-properties</id>
<phase>prepare-package</phase>
<goals>
<goal>revision</goal>
</goals>
<configuration>
<dotGitDirectory>${main.basedir}/.git</dotGitDirectory>
<verbose>true</verbose>
<gitDescribe>
<skip>true</skip>
</gitDescribe>
</configuration>
</execution>
</executions>
<configuration>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>

Loading…
Cancel
Save