Merge branch 'hotfix/2.1.2'

* hotfix/2.1.2:
  pom.xml: version set to 2.1.2
  CHANGELOG
  AbstractCheckMojo: use version of plugin not the using project
This commit is contained in:
Paul Campbell 2017-02-09 12:03:32 +00:00
commit f429bf1dc7
7 changed files with 14 additions and 8 deletions

View file

@ -1,6 +1,11 @@
CHANGELOG
=========
2.1.2
-----
* Use the plugin version to find plugin's own pom
2.1.1
-----

View file

@ -12,7 +12,7 @@
</parent>
<artifactId>kemitix-checkstyle-ruleset-builder</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<packaging>jar</packaging>
<name>Kemitix Checkstyle Ruleset Builder</name>

View file

@ -8,7 +8,7 @@
<!-- don't use parent to avoid using grandparent's checkstyle configuration -->
<groupId>net.kemitix</groupId>
<artifactId>kemitix-checkstyle-ruleset-plugin-sample</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<name>Kemitix Checkstyle Ruleset Plugin Sample</name>
<description>Sample usage of the Kemitix Checkstyle Ruleset Plugin</description>

View file

@ -7,7 +7,7 @@
<parent>
<groupId>net.kemitix</groupId>
<artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
</parent>
<artifactId>kemitix-checkstyle-ruleset-maven-plugin</artifactId>

View file

@ -71,8 +71,6 @@ abstract class AbstractCheckMojo extends AbstractMojo {
private static final String CONFIG_LOCATION = "configLocation";
@Setter
@Parameter(defaultValue = "${project.version}")
private String rulesetVersion;
@Setter
@ -98,6 +96,9 @@ abstract class AbstractCheckMojo extends AbstractMojo {
* @throws MojoFailureException on execution failure
*/
final void performCheck(final String level) throws MojoExecutionException, MojoFailureException {
rulesetVersion = mavenProject.getPlugin(KEMITIX_GROUPID + ":" + KEMITIX_ARTIFACTID + "-maven-plugin")
.getVersion();
debug("rulesetVersion: %s", rulesetVersion);
val properties = getProperties();
debug("properties: %s", properties);

View file

@ -6,7 +6,7 @@
<groupId>net.kemitix</groupId>
<artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<packaging>pom</packaging>
<name>Kemitix Checkstyle Ruleset (Parent)</name>

View file

@ -7,11 +7,11 @@
<parent>
<groupId>net.kemitix</groupId>
<artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
</parent>
<artifactId>kemitix-checkstyle-ruleset</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<packaging>jar</packaging>
<name>Kemitix Checkstyle Ruleset</name>