diff --git a/CHANGELOG b/CHANGELOG
index 68f05a3..c1ca017 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,16 @@
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
-----
diff --git a/README.md b/README.md
index a8ab584..acfd728 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ desired value.
* lombok.version
* digraph-dependency.version
* digraph-dependency.basePackage
+* required-maven.version
+* maven-enforcer-plugin.version
* maven-javadoc-plugin.version
* maven-source-plugin.version
* maven-gpg-plugin.version
@@ -44,6 +46,7 @@ desired value.
* jacoco-class-instruction-covered-ratio
* jacoco-class-missed-count-maximum
* java.version
+* versions.version
## Checkstyle
@@ -65,6 +68,16 @@ following values to select a less-strict ruleset:
* 4-tweaks
* 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
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
* showWarnings: true
-* source: 1.8
-* target: 1.8
+* source: ${java.version}
+* target: ${java.version}
+* encoding: ${project.build.sourceEncoding}
## Maven Surefire Plugin
diff --git a/pom.xml b/pom.xml
index 1f701bf..0097c0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
net.kemitix
kemitix-parent
- 3.0.0
+ 3.1.0
pom
Kemitix Parent
@@ -26,10 +26,6 @@
2015
-
- 3.0.4
-
-
The MIT License (MIT)
@@ -41,14 +37,15 @@
UTF-8
UTF-8
target
- 3.1.0
+ 3.3.0
5-complexity
-
- 1.16.16
-
+ 1.16.18
0.9.0
net.kemitix
+ 3.0.0
+ 2.5.2
+ 3.6
2.10.4
3.0.1
1.6
@@ -71,6 +68,9 @@
0
false
true
+ 2.4
+ 3.0.4
+ 1.4.1
@@ -217,6 +217,46 @@
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ ${maven-enforcer-plugin.version}
+
+
+ enforce-maven
+ validate
+
+ display-info
+ enforce
+
+
+
+
+
+
+ ${required-maven.version}
+
+
+ ${java.version}
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-clean-plugin
+ ${maven-clean-plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-install-plugin
+ ${maven-install-plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+ ${maven-site-plugin.version}
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -232,13 +272,11 @@
${project.build.sourceEncoding}
-
org.apache.maven.plugins
maven-surefire-plugin
${maven-surefire-plugin.version}
-
org.apache.maven.plugins
maven-failsafe-plugin
@@ -258,7 +296,6 @@
-
org.apache.maven.plugins
maven-pmd-plugin
@@ -280,7 +317,6 @@
-
one.util
huntbugs-maven-plugin
@@ -294,7 +330,6 @@
-
org.jacoco
jacoco-maven-plugin
@@ -352,7 +387,6 @@
-
org.pitest
highwheel-maven
@@ -366,7 +400,6 @@
-
org.pitest
pitest-maven
@@ -388,6 +421,11 @@
${pitest.failWhenNoMutations}
+
+ org.codehaus.mojo
+ versions-maven-plugin
+ ${versions.version}
+
@@ -408,7 +446,6 @@
jacoco-maven-plugin
${jacoco-maven-plugin.version}
-
org.apache.maven.plugins
maven-pmd-plugin
@@ -429,6 +466,20 @@
+
+ org.codehaus.mojo
+ versions-maven-plugin
+ ${versions.version}
+
+
+
+ dependency-updates-report
+ plugin-updates-report
+ property-updates-report
+
+
+
+
diff --git a/travis-ci/travis-deploy.sh b/travis-ci/travis-deploy.sh
old mode 100755
new mode 100644
index e01a265..af7f714
--- a/travis-ci/travis-deploy.sh
+++ b/travis-ci/travis-deploy.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-if [ "$TRAVIS_BRANCH" = 'master' ]; then
+if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
echo "Preparing to deploy to nexus..."
openssl aes-256-cbc -K $encrypted_f424d6efdd6f_key -iv $encrypted_f424d6efdd6f_iv \
-in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d