Merge branch release/0.7.0 into master

Remove release profile property activation
Upgrade maven-compiler-plugin to 3.5
Upgrade sevntu-checkstyle to 1.18.0
Remove digraph-dependency-maven-plugin

Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
This commit is contained in:
Paul Campbell 2016-01-26 11:41:21 +00:00
commit bafdcaf3b7
3 changed files with 14 additions and 26 deletions

View file

@ -1,6 +1,14 @@
CHANGELOG CHANGELOG
========= =========
0.7.0
------
* Remove release profile property activation
* Upgrade maven-compiler-plugin to 3.5
* Upgrade sevntu-checkstyle to 1.18.0
* Remove digraph-dependency-maven-plugin
0.6.1 0.6.1
------ ------

View file

@ -18,6 +18,9 @@ The [Maven Checkstyle Plugin](https://maven.apache.org/plugins/maven-checkstyle-
uses the latest version of the Checkstyle library uses the latest version of the Checkstyle library
([Release Notes](http://checkstyle.sourceforge.net/releasenotes.html)). ([Release Notes](http://checkstyle.sourceforge.net/releasenotes.html)).
Also available for you to use are the rules defined by
[Sevntu](http://sevntu-checkstyle.github.io/sevntu.checkstyle/).
<strong>Your project <em>must</em> provide a `checkstyle.xml` file in it's root <strong>Your project <em>must</em> provide a `checkstyle.xml` file in it's root
directory.</strong> See the Checkstyle Plugin homepage for `sun_checks.xml` and directory.</strong> See the Checkstyle Plugin homepage for `sun_checks.xml` and
`google_checks.xml` examples. There is a modified version of `sun_checks.xml` `google_checks.xml` examples. There is a modified version of `sun_checks.xml`

29
pom.xml
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.1</version> <version>0.7.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Kemitix Parent</name> <name>Kemitix Parent</name>
@ -53,12 +53,6 @@
<profiles> <profiles>
<profile> <profile>
<id>release</id> <id>release</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build> <build>
<plugins> <plugins>
<!-- plugin sequence: javadoc, sources, gpg, deploy --> <!-- plugin sequence: javadoc, sources, gpg, deploy -->
@ -143,7 +137,7 @@
<dependency> <dependency>
<groupId>com.github.sevntu.checkstyle</groupId> <groupId>com.github.sevntu.checkstyle</groupId>
<artifactId>sevntu-checkstyle-maven-plugin</artifactId> <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
<version>1.17.1</version> <version>1.18.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin><!-- maven-checkstyle-plugin --> </plugin><!-- maven-checkstyle-plugin -->
@ -154,7 +148,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.5</version>
<configuration> <configuration>
<compilerArgs> <compilerArgs>
<arg>-Xlint:unchecked</arg> <arg>-Xlint:unchecked</arg>
@ -326,23 +320,6 @@
</execution> </execution>
</executions> </executions>
</plugin><!-- highwheel-maven --> </plugin><!-- highwheel-maven -->
<plugin>
<groupId>net.kemitix</groupId>
<artifactId>digraph-dependency-maven-plugin</artifactId>
<version>0.1.2</version>
<configuration>
<basePackage>net.kemitix</basePackage>
</configuration>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>digraph</goal>
</goals>
</execution>
</executions>
</plugin><!-- digraph-dependency-maven-plugin -->
</plugins> </plugins>
</build> </build>