kemitix/kemitix-parent
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #77 from kemitix/release/3.1.0

Browse source 
Release 3.1.0
This commit is contained in:
Paul Campbell 2017-07-14 23:06:45 +01:00 committed by GitHub
commit d48acf36f3
4 changed files with 95 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CHANGELOG
View file

@ -1,6 +1,16 @@
CHANGELOG CHANGELOG
========= =========
3.1.0
-----
* Upgrade `kemitix-checkstyle-ruleset` to 3.3.0
* Upgrade `lombok` to 1.16.18
* Replace `prerequisites/maven` with `maven-enforcer-plugin`
* Explicitly specify version for all plugins
* Upgrade `versions-maven-plugin` to 2.4 and enable reporting
* travis-ci: deploy master only after PR is merged
3.0.0 3.0.0
----- -----

18
README.md
View file

@ -27,6 +27,8 @@ desired value.
* lombok.version * lombok.version
* digraph-dependency.version * digraph-dependency.version
* digraph-dependency.basePackage * digraph-dependency.basePackage
* required-maven.version
* maven-enforcer-plugin.version
* maven-javadoc-plugin.version * maven-javadoc-plugin.version
* maven-source-plugin.version * maven-source-plugin.version
* maven-gpg-plugin.version * maven-gpg-plugin.version
@ -44,6 +46,7 @@ desired value.
* jacoco-class-instruction-covered-ratio * jacoco-class-instruction-covered-ratio
* jacoco-class-missed-count-maximum * jacoco-class-missed-count-maximum
* java.version * java.version
* versions.version
## Checkstyle ## Checkstyle
@ -65,6 +68,16 @@ following values to select a less-strict ruleset:
* 4-tweaks * 4-tweaks
* 5-complexity * 5-complexity
## Maven Enforcer Plugin
Ensures that a suitable version of Maven is being used.
Runs it's `display-info` and `enforce` goals during the `validate` phase.
### Configuration
* requireMavenVersion: ${required-maven.version}
## Maven Compiler Plugin ## Maven Compiler Plugin
The [Maven Compiler Plugin](https://maven.apache.org/plugins/maven-compiler-plugin/) The [Maven Compiler Plugin](https://maven.apache.org/plugins/maven-compiler-plugin/)
@ -76,8 +89,9 @@ Ref: [compile:compile](https://maven.apache.org/plugins/maven-compiler-plugin/co
* showDeprecation: true * showDeprecation: true
* showWarnings: true * showWarnings: true
* source: 1.8 * source: ${java.version}
* target: 1.8 * target: ${java.version}
* encoding: ${project.build.sourceEncoding}
## Maven Surefire Plugin ## Maven Surefire Plugin

85
pom.xml
View file

@ -5,7 +5,7 @@
<groupId>net.kemitix</groupId> <groupId>net.kemitix</groupId>
<artifactId>kemitix-parent</artifactId> <artifactId>kemitix-parent</artifactId>
<version>3.0.0</version> <version>3.1.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Kemitix Parent</name> <name>Kemitix Parent</name>
@ -26,10 +26,6 @@
<inceptionYear>2015</inceptionYear> <inceptionYear>2015</inceptionYear>
<prerequisites>
<maven>3.0.4</maven>
</prerequisites>
<licenses> <licenses>
<license> <license>
<name>The MIT License (MIT)</name> <name>The MIT License (MIT)</name>
@ -41,14 +37,15 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<kemitix.build.directory>target</kemitix.build.directory> <kemitix.build.directory>target</kemitix.build.directory>
<kemitix-checkstyle-ruleset.version>3.1.0</kemitix-checkstyle-ruleset.version> <kemitix-checkstyle-ruleset.version>3.3.0</kemitix-checkstyle-ruleset.version>
<kemitix-checkstyle-ruleset.level>5-complexity</kemitix-checkstyle-ruleset.level> <kemitix-checkstyle-ruleset.level>5-complexity</kemitix-checkstyle-ruleset.level>
<lombok.version>1.16.18</lombok.version>
<lombok.version>1.16.16</lombok.version>
<digraph-dependency.version>0.9.0</digraph-dependency.version> <digraph-dependency.version>0.9.0</digraph-dependency.version>
<digraph-dependency.basePackage>net.kemitix</digraph-dependency.basePackage> <digraph-dependency.basePackage>net.kemitix</digraph-dependency.basePackage>
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-site-plugin.version>3.6</maven-site-plugin.version>
<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version> <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version> <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version> <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
@ -71,6 +68,9 @@
<pitest.mutation>0</pitest.mutation> <pitest.mutation>0</pitest.mutation>
<pitest.skip>false</pitest.skip> <pitest.skip>false</pitest.skip>
<pitest.failWhenNoMutations>true</pitest.failWhenNoMutations> <pitest.failWhenNoMutations>true</pitest.failWhenNoMutations>
<versions.version>2.4</versions.version>
<required-maven.version>3.0.4</required-maven.version>
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
</properties> </properties>
<developers> <developers>
@ -217,6 +217,46 @@
</execution> </execution>
</executions> </executions>
</plugin><!-- digraph-dependency-maven-plugin --> </plugin><!-- digraph-dependency-maven-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce-maven</id>
<phase>validate</phase>
<goals>
<goal>display-info</goal>
<goal>enforce</goal>
</goals>
</execution>
</executions>
<configuration>
<rules>
<requireMavenVersion>
<version>${required-maven.version}</version>
</requireMavenVersion>
<requireJavaVersion>
<version>${java.version}</version>
</requireJavaVersion>
</rules>
</configuration>
</plugin><!-- maven-enforcer-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven-clean-plugin.version}</version>
</plugin><!-- maven-clean-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${maven-install-plugin.version}</version>
</plugin><!-- maven-install-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
</plugin><!-- maven-site-plugin -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -232,13 +272,11 @@
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
</configuration> </configuration>
</plugin><!-- maven-compiler-plugin --> </plugin><!-- maven-compiler-plugin -->
<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>${maven-surefire-plugin.version}</version> <version>${maven-surefire-plugin.version}</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>
@ -258,7 +296,6 @@
</execution> </execution>
</executions> </executions>
</plugin><!-- maven-failsafe-plugin --> </plugin><!-- maven-failsafe-plugin -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
@ -280,7 +317,6 @@
</execution> </execution>
</executions> </executions>
</plugin><!-- maven-pmd-plugin --> </plugin><!-- maven-pmd-plugin -->
<plugin> <plugin>
<groupId>one.util</groupId> <groupId>one.util</groupId>
<artifactId>huntbugs-maven-plugin</artifactId> <artifactId>huntbugs-maven-plugin</artifactId>
@ -294,7 +330,6 @@
</execution> </execution>
</executions> </executions>
</plugin><!-- huntbugs-maven-plugin --> </plugin><!-- huntbugs-maven-plugin -->
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
@ -352,7 +387,6 @@
</rules> </rules>
</configuration> </configuration>
</plugin><!-- jacoco-maven-plugin --> </plugin><!-- jacoco-maven-plugin -->
<plugin> <plugin>
<groupId>org.pitest</groupId> <groupId>org.pitest</groupId>
<artifactId>highwheel-maven</artifactId> <artifactId>highwheel-maven</artifactId>
@ -366,7 +400,6 @@
</execution> </execution>
</executions> </executions>
</plugin><!-- highwheel-maven --> </plugin><!-- highwheel-maven -->
<plugin> <plugin>
<groupId>org.pitest</groupId> <groupId>org.pitest</groupId>
<artifactId>pitest-maven</artifactId> <artifactId>pitest-maven</artifactId>
@ -388,6 +421,11 @@
<failWhenNoMutations>${pitest.failWhenNoMutations}</failWhenNoMutations> <failWhenNoMutations>${pitest.failWhenNoMutations}</failWhenNoMutations>
</configuration> </configuration>
</plugin><!-- pitest-maven --> </plugin><!-- pitest-maven -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${versions.version}</version>
</plugin><!-- versions-maven-plugin -->
</plugins> </plugins>
</build> </build>
@ -408,7 +446,6 @@
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-maven-plugin.version}</version> <version>${jacoco-maven-plugin.version}</version>
</plugin><!-- jacoco-maven-plugin --> </plugin><!-- jacoco-maven-plugin -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
@ -429,6 +466,20 @@
</reportSet> </reportSet>
</reportSets> </reportSets>
</plugin><!-- pitest-maven --> </plugin><!-- pitest-maven -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${versions.version}</version>
<reportSets>
<reportSet>
<reports>
<report>dependency-updates-report</report>
<report>plugin-updates-report</report>
<report>property-updates-report</report>
</reports>
</reportSet>
</reportSets>
</plugin><!-- versions-maven-plugin -->
</plugins> </plugins>
</reporting> </reporting>

2
travis-ci/travis-deploy.sh Executable file → Normal file
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ "$TRAVIS_BRANCH" = 'master' ]; then if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
echo "Preparing to deploy to nexus..." echo "Preparing to deploy to nexus..."
openssl aes-256-cbc -K $encrypted_f424d6efdd6f_key -iv $encrypted_f424d6efdd6f_iv \ openssl aes-256-cbc -K $encrypted_f424d6efdd6f_key -iv $encrypted_f424d6efdd6f_iv \
-in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d -in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d