From 90e3f8cd7005dbd07138c76fb4fa9eb61bd08a41 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 2 Feb 2019 19:12:33 +0000 Subject: [PATCH] Improve use of properties in tile (#164) * [tile] improve use of properties * [tile] rename property to match project name * [readme] remove codacy and sonar badges properly * [changelog] updated --- CHANGELOG.org | 4 ++++ README.md | 2 -- builder/src/main/resources/README-template.md | 14 -------------- tile/pom.xml | 4 ++-- tile/tile.xml | 19 ++++++++++++++----- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 8260604..7be8748 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * [5.3.3] - 2019-02-02 +** Changed + + - [tile] Improved use of properties to remove duplication + ** Dependencies - Bump classgraph from 4.6.9 to 4.6.29 (#158)(#160) diff --git a/README.md b/README.md index f50e9a0..87a6d62 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ Provides an extensive Checkstyle ruleset for use with Checkstyle, together with ![Sonatype Nexus (Release)](https://img.shields.io/nexus/r/https/oss.sonatype.org/net.kemitix.checkstyle/ruleset.svg?style=for-the-badge) ![Maven Central](https://img.shields.io/maven-central/v/net.kemitix.checkstyle/ruleset.svg?style=for-the-badge) - - ![Codacy](https://img.shields.io/codacy/grade/f1208289122e48daa89c46671293b3c2.svg?style=for-the-badge) ![JPeek](http://i.jpeek.org/net.kemitix.checkstyle/ruleset/badge.svg) The ruleset includes checks from both the core Checkstyle library and from the Sevntu-Checkstyle library. diff --git a/builder/src/main/resources/README-template.md b/builder/src/main/resources/README-template.md index fe166d4..cd3fde9 100644 --- a/builder/src/main/resources/README-template.md +++ b/builder/src/main/resources/README-template.md @@ -4,20 +4,6 @@ Provides an extensive Checkstyle ruleset for use with Checkstyle, together with ![Sonatype Nexus (Release)](https://img.shields.io/nexus/r/https/oss.sonatype.org/net.kemitix.checkstyle/ruleset.svg?style=for-the-badge) ![Maven Central](https://img.shields.io/maven-central/v/net.kemitix.checkstyle/ruleset.svg?style=for-the-badge) - - ![Coverage](https://img.shields.io/sonar/https/sonarcloud.io/net.kemitix.checkstyle:builder/coverage.svg?style=for-the-badge#.svg) - ![Tech Debt](https://img.shields.io/sonar/https/sonarcloud.io/net.kemitix.checkstyle:builder/tech_debt.svg?style=for-the-badge#.svg) - ![SQALE Rating](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=sqale_rating#.svg) - ![Alert Status](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=alert_status#.svg) - ![Reliability](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=reliability_rating#.svg) - ![Security](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=security_rating#.svg) - ![SQALE Index](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=sqale_index#.svg) - ![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=vulnerabilities#.svg) - ![Bugs](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=bugs#.svg) - ![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=code_smells#.svg) - ![NCLOC](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=ncloc#.svg) - - ![Codacy](https://img.shields.io/codacy/grade/f1208289122e48daa89c46671293b3c2.svg?style=for-the-badge) ![JPeek](http://i.jpeek.org/net.kemitix.checkstyle/ruleset/badge.svg) The ruleset includes checks from both the core Checkstyle library and from the Sevntu-Checkstyle library. diff --git a/tile/pom.xml b/tile/pom.xml index 2e1bf9c..83f6bee 100644 --- a/tile/pom.xml +++ b/tile/pom.xml @@ -18,7 +18,7 @@ 2.12 - 0.8.1 + 0.8.1 3.0.0 8.16 @@ -66,7 +66,7 @@ true - net.kemitix.tiles:maven-plugins:${kemitix-tiles.version} + net.kemitix.tiles:maven-plugins:${kemitix-maven-tiles.version} diff --git a/tile/tile.xml b/tile/tile.xml index 21a83c4..7ebdbb5 100644 --- a/tile/tile.xml +++ b/tile/tile.xml @@ -1,29 +1,38 @@ + + @maven-checkstyle-plugin.version@ + @checkstyle.version@ + @sevntu.version@ + @kemitix.checkstyle.ruleset.version@ + @build.sourceDirectory@ + 5-complexity + net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml + org.apache.maven.plugins maven-checkstyle-plugin - @maven-checkstyle-plugin.version@ + ${maven-checkstyle-plugin.version} com.puppycrawl.tools checkstyle - @checkstyle.version@ + ${checkstyle.version} com.github.sevntu-checkstyle sevntu-checkstyle-maven-plugin - @sevntu.version@ + ${sevntu.version} net.kemitix.checkstyle ruleset - @kemitix.checkstyle.ruleset.version@ + ${kemitix.checkstyle.ruleset.version} - @kemitix.checkstyle.ruleset.location@ + ${kemitix.checkstyle.ruleset.location} ${build.sourceDirectory}