Merge branch release/0.6.1 into master

Upgrade maven-surefire-plugin to 2.19.1

Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
This commit is contained in:
Paul Campbell 2016-01-12 13:40:31 +00:00
commit bfa7f0f535
2 changed files with 9 additions and 4 deletions

View file

@ -1,6 +1,11 @@
CHANGELOG CHANGELOG
========= =========
0.6.1
------
* Upgrade maven-surefire-plugin to 2.19.1
0.6.0 0.6.0
------ ------

View file

@ -4,7 +4,7 @@
<groupId>net.kemitix</groupId> <groupId>net.kemitix</groupId>
<artifactId>kemitix-parent</artifactId> <artifactId>kemitix-parent</artifactId>
<version>0.6.0</version> <version>0.6.1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Kemitix Parent</name> <name>Kemitix Parent</name>
@ -169,13 +169,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version> <version>2.19.1</version>
</plugin><!-- maven-surefire-plugin --> </plugin><!-- maven-surefire-plugin -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version> <version>2.19.1</version>
<executions> <executions>
<execution> <execution>
<id>integration-test</id> <id>integration-test</id>
@ -356,7 +356,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId> <artifactId>maven-surefire-report-plugin</artifactId>
<version>2.18.1</version> <version>2.19.1</version>
</plugin><!-- maven-surefire-report-plugin --> </plugin><!-- maven-surefire-report-plugin -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>