From c7bb2aaf0d36ae7341a84aaf1c956147e6b53d0f Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 18 Sep 2017 19:52:55 +0100 Subject: [PATCH 01/34] version: set to 4.1.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d472e68..ae78f97 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.kemitix kemitix-parent - 4.0.0 + 4.1.0-SNAPSHOT pom Kemitix Parent From 83527af4d3cbed383ac41284cfc4732ff6e75a3a Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 22 Dec 2017 19:17:58 +0000 Subject: [PATCH 02/34] Initial commit with checkstyle tile --- .gitignore | 36 +++++++++++++++ LICENSE.txt | 0 example/LICENSE.txt | 20 ++++++++ example/pom.xml | 32 +++++++++++++ .../java/net/kemitix/tiles/example/Main.java | 40 ++++++++++++++++ .../kemitix/tiles/example/package-info.java | 22 +++++++++ pom.xml | 21 +++++++++ tiles/checkstyle/pom.xml | 28 +++++++++++ tiles/checkstyle/tile.xml | 46 +++++++++++++++++++ tiles/pom.xml | 17 +++++++ 10 files changed, 262 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE.txt create mode 100644 example/LICENSE.txt create mode 100644 example/pom.xml create mode 100644 example/src/main/java/net/kemitix/tiles/example/Main.java create mode 100644 example/src/main/java/net/kemitix/tiles/example/package-info.java create mode 100644 pom.xml create mode 100644 tiles/checkstyle/pom.xml create mode 100644 tiles/checkstyle/tile.xml create mode 100644 tiles/pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e68e0db --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +# Package Files # +*.jar +*.war +*.ear +*.zip + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# maven build outputs +target/ + +# netbeans legacy +nbproject/ +nbactions.xml + +# eclipse legacy +.project + +# intellij +.idea/ +*.iml + +# Spring +spring.log +logs/ +/application.properties +/bootstrap.properties + +# Composer-style +vendor + +# Git and temp files +*.orig +*.patch +*~ diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..e69de29 diff --git a/example/LICENSE.txt b/example/LICENSE.txt new file mode 100644 index 0000000..0ac5ca6 --- /dev/null +++ b/example/LICENSE.txt @@ -0,0 +1,20 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2017 Paul Campbell + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software + * and associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies + * or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ diff --git a/example/pom.xml b/example/pom.xml new file mode 100644 index 0000000..2c723d5 --- /dev/null +++ b/example/pom.xml @@ -0,0 +1,32 @@ + + + + net.kemitix.tiles + 0.1.0-SNAPSHOT + 4.0.0 + + example + + + 2.10 + + + + + + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true + + + net.kemitix.tiles:quality-checkstyle-tile:${project.version} + + + + + + + diff --git a/example/src/main/java/net/kemitix/tiles/example/Main.java b/example/src/main/java/net/kemitix/tiles/example/Main.java new file mode 100644 index 0000000..a351d17 --- /dev/null +++ b/example/src/main/java/net/kemitix/tiles/example/Main.java @@ -0,0 +1,40 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2017 Paul Campbell + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software + * and associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies + * or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package net.kemitix.tiles.example; + +/** + * Main class. + * + * @author Paul Campbell (pcampbell@kemitix.net) + */ +@SuppressWarnings("hideutilityclassconstructor") +public class Main { + + /** + * Main method. + * + * @param args command line args + */ + public static void main(final String[] args) { + System.out.println("Hello, World!"); + } +} diff --git a/example/src/main/java/net/kemitix/tiles/example/package-info.java b/example/src/main/java/net/kemitix/tiles/example/package-info.java new file mode 100644 index 0000000..20bfa04 --- /dev/null +++ b/example/src/main/java/net/kemitix/tiles/example/package-info.java @@ -0,0 +1,22 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2017 Paul Campbell + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software + * and associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies + * or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package net.kemitix.tiles.example; diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..ef98da9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + net.kemitix.tiles + kemitix-quality-maven-tiles + 0.1.0-SNAPSHOT + + 2.10 + + + pom + + + tiles + example + + + diff --git a/tiles/checkstyle/pom.xml b/tiles/checkstyle/pom.xml new file mode 100644 index 0000000..e88b156 --- /dev/null +++ b/tiles/checkstyle/pom.xml @@ -0,0 +1,28 @@ + + + + net.kemitix.tiles + 0.1.0-SNAPSHOT + 4.0.0 + + quality-checkstyle-tile + tile + + + 2.10 + + + + + + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true + + + + + diff --git a/tiles/checkstyle/tile.xml b/tiles/checkstyle/tile.xml new file mode 100644 index 0000000..70126f8 --- /dev/null +++ b/tiles/checkstyle/tile.xml @@ -0,0 +1,46 @@ + + + 2.17 + 8.0 + 1.24.1 + 3.3.0 + 5-complexity + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + com.github.sevntu-checkstyle + sevntu-checkstyle-maven-plugin + ${sevntu.version} + + + net.kemitix + kemitix-checkstyle-ruleset + ${ruleset.version} + + + + net/kemitix/checkstyle-${ruleset.level}.xml + + + + verify + + check + + + + + + + diff --git a/tiles/pom.xml b/tiles/pom.xml new file mode 100644 index 0000000..8c25770 --- /dev/null +++ b/tiles/pom.xml @@ -0,0 +1,17 @@ + + + + net.kemitix.tiles + 0.1.0-SNAPSHOT + 4.0.0 + + tiles-parent + pom + + + checkstyle + + + From 3c94d6b3e41117c84fc4c277b6f8d68403b6b76f Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 22 Dec 2017 19:59:49 +0000 Subject: [PATCH 03/34] Remove example - makes build more complex than needed --- example/LICENSE.txt | 20 ---------- example/pom.xml | 32 --------------- .../java/net/kemitix/tiles/example/Main.java | 40 ------------------- .../kemitix/tiles/example/package-info.java | 22 ---------- pom.xml | 1 - 5 files changed, 115 deletions(-) delete mode 100644 example/LICENSE.txt delete mode 100644 example/pom.xml delete mode 100644 example/src/main/java/net/kemitix/tiles/example/Main.java delete mode 100644 example/src/main/java/net/kemitix/tiles/example/package-info.java diff --git a/example/LICENSE.txt b/example/LICENSE.txt deleted file mode 100644 index 0ac5ca6..0000000 --- a/example/LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2017 Paul Campbell - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software - * and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies - * or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ diff --git a/example/pom.xml b/example/pom.xml deleted file mode 100644 index 2c723d5..0000000 --- a/example/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - net.kemitix.tiles - 0.1.0-SNAPSHOT - 4.0.0 - - example - - - 2.10 - - - - - - io.repaint.maven - tiles-maven-plugin - ${tiles-maven-plugin.version} - true - - - net.kemitix.tiles:quality-checkstyle-tile:${project.version} - - - - - - - diff --git a/example/src/main/java/net/kemitix/tiles/example/Main.java b/example/src/main/java/net/kemitix/tiles/example/Main.java deleted file mode 100644 index a351d17..0000000 --- a/example/src/main/java/net/kemitix/tiles/example/Main.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2017 Paul Campbell - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software - * and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies - * or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package net.kemitix.tiles.example; - -/** - * Main class. - * - * @author Paul Campbell (pcampbell@kemitix.net) - */ -@SuppressWarnings("hideutilityclassconstructor") -public class Main { - - /** - * Main method. - * - * @param args command line args - */ - public static void main(final String[] args) { - System.out.println("Hello, World!"); - } -} diff --git a/example/src/main/java/net/kemitix/tiles/example/package-info.java b/example/src/main/java/net/kemitix/tiles/example/package-info.java deleted file mode 100644 index 20bfa04..0000000 --- a/example/src/main/java/net/kemitix/tiles/example/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2017 Paul Campbell - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software - * and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies - * or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package net.kemitix.tiles.example; diff --git a/pom.xml b/pom.xml index ef98da9..b57962b 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,6 @@ tiles - example From 7649557324a7876f126d33d4fa6ab0077bbf9f03 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 22 Dec 2017 20:00:53 +0000 Subject: [PATCH 04/34] Rename artifacts --- pom.xml | 2 +- tiles/checkstyle/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b57962b..29561eb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 net.kemitix.tiles - kemitix-quality-maven-tiles + kemitix-maven-tiles 0.1.0-SNAPSHOT 2.10 diff --git a/tiles/checkstyle/pom.xml b/tiles/checkstyle/pom.xml index e88b156..df5c029 100644 --- a/tiles/checkstyle/pom.xml +++ b/tiles/checkstyle/pom.xml @@ -7,7 +7,7 @@ 0.1.0-SNAPSHOT 4.0.0 - quality-checkstyle-tile + checkstyle-tile tile From 257a7a67155d26caede6aaed4d2b07752fde21ba Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 22 Dec 2017 20:11:03 +0000 Subject: [PATCH 05/34] Add compiler tile --- {tiles/checkstyle => checkstyle}/pom.xml | 12 +++++------ {tiles/checkstyle => checkstyle}/tile.xml | 0 compiler/pom.xml | 26 +++++++++++++++++++++++ compiler/tile.xml | 26 +++++++++++++++++++++++ pom.xml | 7 +++--- tiles/pom.xml | 17 --------------- 6 files changed, 61 insertions(+), 27 deletions(-) rename {tiles/checkstyle => checkstyle}/pom.xml (79%) rename {tiles/checkstyle => checkstyle}/tile.xml (100%) create mode 100644 compiler/pom.xml create mode 100644 compiler/tile.xml delete mode 100644 tiles/pom.xml diff --git a/tiles/checkstyle/pom.xml b/checkstyle/pom.xml similarity index 79% rename from tiles/checkstyle/pom.xml rename to checkstyle/pom.xml index df5c029..469f402 100644 --- a/tiles/checkstyle/pom.xml +++ b/checkstyle/pom.xml @@ -2,18 +2,16 @@ - - net.kemitix.tiles - 0.1.0-SNAPSHOT + + kemitix-maven-tiles + net.kemitix.tiles + 0.1.0-SNAPSHOT + 4.0.0 checkstyle-tile tile - - 2.10 - - diff --git a/tiles/checkstyle/tile.xml b/checkstyle/tile.xml similarity index 100% rename from tiles/checkstyle/tile.xml rename to checkstyle/tile.xml diff --git a/compiler/pom.xml b/compiler/pom.xml new file mode 100644 index 0000000..204e7a4 --- /dev/null +++ b/compiler/pom.xml @@ -0,0 +1,26 @@ + + + + kemitix-maven-tiles + net.kemitix.tiles + 0.1.0-SNAPSHOT + + 4.0.0 + tile + + compiler-tile + + + + + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true + + + + + diff --git a/compiler/tile.xml b/compiler/tile.xml new file mode 100644 index 0000000..f3222f1 --- /dev/null +++ b/compiler/tile.xml @@ -0,0 +1,26 @@ + + + 1.8 + 3.7.0 + UTF-8 + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + -Xlint:unchecked + + true + true + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + + diff --git a/pom.xml b/pom.xml index 29561eb..9b710be 100644 --- a/pom.xml +++ b/pom.xml @@ -7,14 +7,15 @@ net.kemitix.tiles kemitix-maven-tiles 0.1.0-SNAPSHOT + + pom 2.10 - pom - - tiles + checkstyle + compiler diff --git a/tiles/pom.xml b/tiles/pom.xml deleted file mode 100644 index 8c25770..0000000 --- a/tiles/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - net.kemitix.tiles - 0.1.0-SNAPSHOT - 4.0.0 - - tiles-parent - pom - - - checkstyle - - - From e11d3c7eaed67644cef6285ca186f117e9ca4481 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 22 Dec 2017 20:15:11 +0000 Subject: [PATCH 06/34] Add tiles-parent --- checkstyle/pom.xml | 14 ++------------ compiler/pom.xml | 16 +++------------- pom.xml | 4 +--- tiles-parent/pom.xml | 29 +++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 28 deletions(-) create mode 100644 tiles-parent/pom.xml diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml index 469f402..9313f31 100644 --- a/checkstyle/pom.xml +++ b/checkstyle/pom.xml @@ -3,24 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kemitix-maven-tiles + tiles-parent net.kemitix.tiles 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml 4.0.0 checkstyle-tile tile - - - - io.repaint.maven - tiles-maven-plugin - ${tiles-maven-plugin.version} - true - - - - diff --git a/compiler/pom.xml b/compiler/pom.xml index 204e7a4..c0d13f9 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -3,24 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kemitix-maven-tiles + tiles-parent net.kemitix.tiles 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml 4.0.0 - tile compiler-tile - - - - - io.repaint.maven - tiles-maven-plugin - ${tiles-maven-plugin.version} - true - - - + tile diff --git a/pom.xml b/pom.xml index 9b710be..2af9c11 100644 --- a/pom.xml +++ b/pom.xml @@ -9,13 +9,11 @@ 0.1.0-SNAPSHOT pom - - 2.10 - checkstyle compiler + tiles-parent diff --git a/tiles-parent/pom.xml b/tiles-parent/pom.xml new file mode 100644 index 0000000..c39ebaf --- /dev/null +++ b/tiles-parent/pom.xml @@ -0,0 +1,29 @@ + + + + kemitix-maven-tiles + net.kemitix.tiles + 0.1.0-SNAPSHOT + + 4.0.0 + + tiles-parent + pom + + + 2.10 + + + + + + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true + + + + From 954fe728dcc4381bb4493b6feccdbc61a423a674 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 22 Dec 2017 20:36:26 +0000 Subject: [PATCH 07/34] Add README.md --- README.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..f88a4df --- /dev/null +++ b/README.md @@ -0,0 +1,26 @@ +# Kemitix Maven Tiles + +## Usage + +```xml + + 2.10 + 0.1.0-SNAPSHOT + + + + + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true + + + net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} + net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} + + + + + +``` From 5c49c2ce1d429f1d1a7a462c0140f2942372693d Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 22 Dec 2017 20:47:35 +0000 Subject: [PATCH 08/34] Add release-tile --- README.md | 3 ++ pom.xml | 1 + release/pom.xml | 16 ++++++++++ release/tile.xml | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+) create mode 100644 release/pom.xml create mode 100644 release/tile.xml diff --git a/README.md b/README.md index f88a4df..2866f0b 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,12 @@ net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} + net.kemitix.tiles:release-tile:${kemitix-tiles.version} ``` + +Enabling the plugins in the `release-tile` requires the `release` profile to be active. diff --git a/pom.xml b/pom.xml index 2af9c11..e67cfaf 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ checkstyle compiler tiles-parent + release diff --git a/release/pom.xml b/release/pom.xml new file mode 100644 index 0000000..6da424f --- /dev/null +++ b/release/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + release-tile + tile + + diff --git a/release/tile.xml b/release/tile.xml new file mode 100644 index 0000000..dc28eba --- /dev/null +++ b/release/tile.xml @@ -0,0 +1,83 @@ + + + 3.0.0-M1 + 3.0.1 + 1.6 + 2.8.2 + + + + release + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + attach-javadocs + package + + jar + + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + attach-sources + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + ${gpg.passphrase} + + + + sign-artifacts + package + + sign + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + From fcb8dada3301a7170b57c36fef2d61b5e720a1dd Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 15:17:32 +0000 Subject: [PATCH 09/34] Add digraph-tile --- README.md | 45 ++++++++++++++++++++++++--------------------- digraph/pom.xml | 16 ++++++++++++++++ digraph/tile.xml | 26 ++++++++++++++++++++++++++ pom.xml | 3 ++- 4 files changed, 68 insertions(+), 22 deletions(-) create mode 100644 digraph/pom.xml create mode 100644 digraph/tile.xml diff --git a/README.md b/README.md index 2866f0b..8891df9 100644 --- a/README.md +++ b/README.md @@ -3,27 +3,30 @@ ## Usage ```xml - - 2.10 - 0.1.0-SNAPSHOT - - - - - io.repaint.maven - tiles-maven-plugin - ${tiles-maven-plugin.version} - true - - - net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} - net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} - net.kemitix.tiles:release-tile:${kemitix-tiles.version} - - - - - + + + 2.10 + 0.1.0-SNAPSHOT + + + + + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true + + + net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} + net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} + net.kemitix.tiles:digraph-tile:${kemitix-tiles.version} + net.kemitix.tiles:release-tile:${kemitix-tiles.version} + + + + + + ``` Enabling the plugins in the `release-tile` requires the `release` profile to be active. diff --git a/digraph/pom.xml b/digraph/pom.xml new file mode 100644 index 0000000..3397798 --- /dev/null +++ b/digraph/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + digraph-tile + tile + + diff --git a/digraph/tile.xml b/digraph/tile.xml new file mode 100644 index 0000000..df398fd --- /dev/null +++ b/digraph/tile.xml @@ -0,0 +1,26 @@ + + + 0.9.0 + net.kemitix + + + + + net.kemitix + digraph-dependency-maven-plugin + ${digraph-dependency.version} + + ${digraph-dependency.basePackage} + + + + verify + + digraph + + + + + + + diff --git a/pom.xml b/pom.xml index e67cfaf..c8e4bdb 100644 --- a/pom.xml +++ b/pom.xml @@ -11,10 +11,11 @@ pom + tiles-parent checkstyle compiler - tiles-parent release + digraph From 17ed2afea8a59584736212683d51eadde72d6bbb Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 15:24:21 +0000 Subject: [PATCH 10/34] Add enforcer-tile --- README.md | 1 + enforcer/pom.xml | 16 ++++++++++++++++ enforcer/tile.xml | 36 ++++++++++++++++++++++++++++++++++++ pom.xml | 1 + 4 files changed, 54 insertions(+) create mode 100644 enforcer/pom.xml create mode 100644 enforcer/tile.xml diff --git a/README.md b/README.md index 8891df9..3122ca6 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ true + net.kemitix.tiles:enforcer-tile:${kemitix-tiles.version} net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} net.kemitix.tiles:digraph-tile:${kemitix-tiles.version} diff --git a/enforcer/pom.xml b/enforcer/pom.xml new file mode 100644 index 0000000..969c3ba --- /dev/null +++ b/enforcer/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + enforcer-tile + tile + + diff --git a/enforcer/tile.xml b/enforcer/tile.xml new file mode 100644 index 0000000..6cf8764 --- /dev/null +++ b/enforcer/tile.xml @@ -0,0 +1,36 @@ + + + 1.4.1 + 3.0.4 + 1.8 + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + enforce-maven + validate + + display-info + enforce + + + + + + + ${required-maven.version} + + + ${java.version} + + + + + + + diff --git a/pom.xml b/pom.xml index c8e4bdb..6b7b968 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ compiler release digraph + enforcer From e929f162f054025adae1ff62d37dbe0b09a662bf Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 15:29:51 +0000 Subject: [PATCH 11/34] Add testing-tile --- README.md | 1 + pom.xml | 1 + testing/pom.xml | 16 ++++++++++++++++ testing/tile.xml | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 testing/pom.xml create mode 100644 testing/tile.xml diff --git a/README.md b/README.md index 3122ca6..fe9277c 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} net.kemitix.tiles:digraph-tile:${kemitix-tiles.version} + net.kemitix.tiles:testing-tile:${kemitix-tiles.version} net.kemitix.tiles:release-tile:${kemitix-tiles.version} diff --git a/pom.xml b/pom.xml index 6b7b968..eb5aad9 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ release digraph enforcer + testing diff --git a/testing/pom.xml b/testing/pom.xml new file mode 100644 index 0000000..686bd33 --- /dev/null +++ b/testing/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + testing-tile + tile + + diff --git a/testing/tile.xml b/testing/tile.xml new file mode 100644 index 0000000..08b62b2 --- /dev/null +++ b/testing/tile.xml @@ -0,0 +1,43 @@ + + + 2.20.1 + 2.20.1 + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + integration-test + + integration-test + + + + verify + + verify + + + + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${maven-surefire-plugin.version} + + + + From b1c836d7130ef634c5acb53cacd01a8e174d058f Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 17:13:28 +0000 Subject: [PATCH 12/34] Add coverage-tile --- README.md | 1 + coverage/pom.xml | 16 +++++++++ coverage/tile.xml | 90 +++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 1 + 4 files changed, 108 insertions(+) create mode 100644 coverage/pom.xml create mode 100644 coverage/tile.xml diff --git a/README.md b/README.md index fe9277c..607bbce 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} net.kemitix.tiles:digraph-tile:${kemitix-tiles.version} net.kemitix.tiles:testing-tile:${kemitix-tiles.version} + net.kemitix.tiles:coverage-tile:${kemitix-tiles.version} net.kemitix.tiles:release-tile:${kemitix-tiles.version} diff --git a/coverage/pom.xml b/coverage/pom.xml new file mode 100644 index 0000000..7adea36 --- /dev/null +++ b/coverage/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + coverage-tile + tile + + diff --git a/coverage/tile.xml b/coverage/tile.xml new file mode 100644 index 0000000..9a62b10 --- /dev/null +++ b/coverage/tile.xml @@ -0,0 +1,90 @@ + + + 0.7.9 + 4.3.0 + 2.5 + 0.50 + 0.80 + 0 + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + + prepare-agent + + + + report + prepare-package + + report + + + + default-check + + check + + + + + + + CLASS + + *Test + *IT + *Main + *Application + *Configuration + *Immutable* + + + + LINE + COVEREDRATIO + ${jacoco-class-line-covered-ratio} + + + INSTRUCTION + COVEREDRATIO + ${jacoco-class-instruction-covered-ratio} + + + CLASS + MISSEDCOUNT + ${jacoco-class-missed-count-maximum} + + + + + + + + org.eluder.coveralls + coveralls-maven-plugin + ${coveralls-maven-plugin.version} + + + + + + + org.apache.maven.plugins + maven-jxr-plugin + ${maven-jxr-plugin.version} + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + + diff --git a/pom.xml b/pom.xml index eb5aad9..159ec4b 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ release digraph enforcer + coverage testing From 979acdfab19cc588add811afd84635c8c990f3d9 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 17:22:05 +0000 Subject: [PATCH 13/34] FIXUP coverage --- coverage/tile.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/coverage/tile.xml b/coverage/tile.xml index 9a62b10..13c8f79 100644 --- a/coverage/tile.xml +++ b/coverage/tile.xml @@ -1,5 +1,6 @@ + UTF-8 0.7.9 4.3.0 2.5 From aa6b80eacdfdcf9ee07668d78ce75be51900bcb7 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 17:22:27 +0000 Subject: [PATCH 14/34] FIXUP testing --- testing/tile.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/testing/tile.xml b/testing/tile.xml index 08b62b2..4e139d2 100644 --- a/testing/tile.xml +++ b/testing/tile.xml @@ -1,5 +1,6 @@ + UTF-8 2.20.1 2.20.1 From 8f87de96a20cb9485cabe30e35df730f19c07fbb Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 17:26:28 +0000 Subject: [PATCH 15/34] Add maven-plugins-tile --- README.md | 1 + maven-plugins/pom.xml | 16 +++++++++++++ maven-plugins/tile.xml | 51 ++++++++++++++++++++++++++++++++++++++++++ pom.xml | 1 + 4 files changed, 69 insertions(+) create mode 100644 maven-plugins/pom.xml create mode 100644 maven-plugins/tile.xml diff --git a/README.md b/README.md index 607bbce..42b4de5 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ true + net.kemitix.tiles:maven-plugins-tile:${kemitix-tiles.version} net.kemitix.tiles:enforcer-tile:${kemitix-tiles.version} net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml new file mode 100644 index 0000000..d02012e --- /dev/null +++ b/maven-plugins/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + maven-plugins-tile + tile + + diff --git a/maven-plugins/tile.xml b/maven-plugins/tile.xml new file mode 100644 index 0000000..6550a9c --- /dev/null +++ b/maven-plugins/tile.xml @@ -0,0 +1,51 @@ + + + UTF-8 + 3.0.0 + 2.5.2 + 3.6 + 2.4 + + + + + 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.codehaus.mojo + versions-maven-plugin + ${versions.version} + + + + + + + org.codehaus.mojo + versions-maven-plugin + ${versions.version} + + + + dependency-updates-report + plugin-updates-report + property-updates-report + + + + + + + diff --git a/pom.xml b/pom.xml index 159ec4b..3dca988 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ enforcer coverage testing + maven-plugins From e78b18cfc1882714b72fe0196d8b66d4137467bb Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 17:32:35 +0000 Subject: [PATCH 16/34] Add pitest-tile --- README.md | 1 + pitest/pom.xml | 16 +++++++++++++ pitest/tile.xml | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 1 + 4 files changed, 82 insertions(+) create mode 100644 pitest/pom.xml create mode 100644 pitest/tile.xml diff --git a/README.md b/README.md index 42b4de5..05a567b 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ net.kemitix.tiles:digraph-tile:${kemitix-tiles.version} net.kemitix.tiles:testing-tile:${kemitix-tiles.version} net.kemitix.tiles:coverage-tile:${kemitix-tiles.version} + net.kemitix.tiles:pitest-tile:${kemitix-tiles.version} net.kemitix.tiles:release-tile:${kemitix-tiles.version} diff --git a/pitest/pom.xml b/pitest/pom.xml new file mode 100644 index 0000000..78adf33 --- /dev/null +++ b/pitest/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + pitest-tile + tile + + diff --git a/pitest/tile.xml b/pitest/tile.xml new file mode 100644 index 0000000..0a9fd46 --- /dev/null +++ b/pitest/tile.xml @@ -0,0 +1,64 @@ + + + 1.2 + 1.2.0 + 0 + 0 + false + true + + + + + org.pitest + highwheel-maven + ${highwheel-maven.version} + + + verify + + analyse + + + + + + org.pitest + pitest-maven + ${pitest.version} + + + verify + + mutationCoverage + + + + + ${pitest.skip} + false + *.Immutable* + ${pitest.coverage} + ${pitest.mutation} + ${pitest.failWhenNoMutations} + + + + + + + + org.pitest + pitest-maven + ${pitest.version} + + + + report + + + + + + + diff --git a/pom.xml b/pom.xml index 3dca988..d49440c 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,7 @@ coverage testing maven-plugins + pitest From 44b22f114dc9710d07683d43fe67cc19a55becdb Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 17:36:15 +0000 Subject: [PATCH 17/34] Add huntbugs-tile --- README.md | 1 + huntbugs/pom.xml | 16 ++++++++++++++++ huntbugs/tile.xml | 22 ++++++++++++++++++++++ pom.xml | 1 + 4 files changed, 40 insertions(+) create mode 100644 huntbugs/pom.xml create mode 100644 huntbugs/tile.xml diff --git a/README.md b/README.md index 05a567b..15c734c 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ net.kemitix.tiles:enforcer-tile:${kemitix-tiles.version} net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} + net.kemitix.tiles:huntbugs-tile:${kemitix-tiles.version} net.kemitix.tiles:digraph-tile:${kemitix-tiles.version} net.kemitix.tiles:testing-tile:${kemitix-tiles.version} net.kemitix.tiles:coverage-tile:${kemitix-tiles.version} diff --git a/huntbugs/pom.xml b/huntbugs/pom.xml new file mode 100644 index 0000000..43e8a39 --- /dev/null +++ b/huntbugs/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + huntbugs-tile + tile + + diff --git a/huntbugs/tile.xml b/huntbugs/tile.xml new file mode 100644 index 0000000..26c6c23 --- /dev/null +++ b/huntbugs/tile.xml @@ -0,0 +1,22 @@ + + + 0.0.11 + + + + + one.util + huntbugs-maven-plugin + ${huntbugs.version} + + + verify + + huntbugs + + + + + + + diff --git a/pom.xml b/pom.xml index d49440c..9e2afeb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ testing maven-plugins pitest + huntbugs From f2fe36bcf454d7732612b0c2418ef04b39b3dadc Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 23 Dec 2017 17:39:48 +0000 Subject: [PATCH 18/34] Add pmd-tile --- README.md | 1 + pmd/pom.xml | 16 ++++++++++++++++ pmd/tile.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ pom.xml | 1 + 4 files changed, 60 insertions(+) create mode 100644 pmd/pom.xml create mode 100644 pmd/tile.xml diff --git a/README.md b/README.md index 15c734c..6088c9d 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} net.kemitix.tiles:huntbugs-tile:${kemitix-tiles.version} + net.kemitix.tiles:pmd-tile:${kemitix-tiles.version} net.kemitix.tiles:digraph-tile:${kemitix-tiles.version} net.kemitix.tiles:testing-tile:${kemitix-tiles.version} net.kemitix.tiles:coverage-tile:${kemitix-tiles.version} diff --git a/pmd/pom.xml b/pmd/pom.xml new file mode 100644 index 0000000..0ec323d --- /dev/null +++ b/pmd/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + pmd-tile + tile + + diff --git a/pmd/tile.xml b/pmd/tile.xml new file mode 100644 index 0000000..febb5a9 --- /dev/null +++ b/pmd/tile.xml @@ -0,0 +1,42 @@ + + + 3.8 + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + + pmd + verify + + pmd + + + + cpd + verify + + cpd + + + + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + true + + + + + diff --git a/pom.xml b/pom.xml index 9e2afeb..ee552ba 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,7 @@ maven-plugins pitest huntbugs + pmd From 6a41657e1dc33771382b0d4c3b14d61de3d7d8d4 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sun, 24 Dec 2017 09:00:22 +0000 Subject: [PATCH 19/34] Move JXR to maven-tile and build source code pages during package phase Building the source code during packaging ensures that the source code pages are available for PMD when it generates cross-reference links. --- coverage/tile.xml | 6 ------ maven-plugins/tile.xml | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/coverage/tile.xml b/coverage/tile.xml index 13c8f79..02e7c1d 100644 --- a/coverage/tile.xml +++ b/coverage/tile.xml @@ -3,7 +3,6 @@ UTF-8 0.7.9 4.3.0 - 2.5 0.50 0.80 0 @@ -76,11 +75,6 @@ - - org.apache.maven.plugins - maven-jxr-plugin - ${maven-jxr-plugin.version} - org.jacoco jacoco-maven-plugin diff --git a/maven-plugins/tile.xml b/maven-plugins/tile.xml index 6550a9c..1bcea92 100644 --- a/maven-plugins/tile.xml +++ b/maven-plugins/tile.xml @@ -4,6 +4,7 @@ 3.0.0 2.5.2 3.6 + 2.5 2.4 @@ -28,10 +29,28 @@ versions-maven-plugin ${versions.version} + + org.apache.maven.plugins + maven-jxr-plugin + ${maven-jxr-plugin.version} + + + package + + jxr + + + + + + org.apache.maven.plugins + maven-jxr-plugin + ${maven-jxr-plugin.version} + org.codehaus.mojo versions-maven-plugin From 2744b6f59c748eb8a95cb5f16f44c50e11f25eac Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sun, 24 Dec 2017 09:08:55 +0000 Subject: [PATCH 20/34] Extract plugin config to `kemitix-maven-tiles` and remove lombok --- CHANGELOG | 6 ++ pom.xml | 283 +----------------------------------------------------- 2 files changed, 8 insertions(+), 281 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0014081..5711008 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,12 @@ CHANGELOG ========= +5.0.0 +----- + +* [BREAKING] Split most configuration out into `kemitix-maven-tiles` +* [BREAKING] No longer provide lombok as a dependency + 4.0.0 ----- diff --git a/pom.xml b/pom.xml index ae78f97..49ace16 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.kemitix kemitix-parent - 4.1.0-SNAPSHOT + 5.0.0-SNAPSHOT pom Kemitix Parent @@ -34,33 +34,8 @@ - UTF-8 UTF-8 - target - 0.2.1 - net.kemitix - - 1.16.18 - 1.8 - 3.0.0 - 2.5.2 - 2.5.3 - 3.6 - 3.0.0-M1 - 3.0.1 - 1.6 - 2.8.2 - 3.7.0 - 3.0.2 - 3.1.0 - 2.20.1 - 2.20.1 - 2.5 - 2.9 - 1.8 - 2.4 - 4.3.0 @@ -72,75 +47,7 @@ - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - - - release - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - verify - - jar - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - verify - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - ${gpg.passphrase} - - - - sign-artifacts - verify - - sign - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - - - - - + sonatype-snapshots @@ -153,7 +60,6 @@ - sonatype-snapshots @@ -167,189 +73,4 @@ - - ${kemitix.build.directory} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - org.apache.maven.plugins - maven-clean-plugin - ${maven-clean-plugin.version} - - - org.apache.maven.plugins - maven-antrun-plugin - ${maven-antrun-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 - ${maven-compiler-plugin.version} - - - -Xlint:unchecked - - true - true - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - - net.kemitix - kemitix-quality-maven-plugin - ${kemitix-quality-maven-plugin.version} - - - - validate - verify - - - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven-assembly-plugin.version} - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - - integration-test - - integration-test - - - - verify - - verify - - - - - - org.eluder.coveralls - coveralls-maven-plugin - ${coveralls-maven-plugin.version} - - - org.codehaus.mojo - versions-maven-plugin - ${versions.version} - - - - - - - net.kemitix - kemitix-quality-maven-plugin - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven-project-info-reports-plugin.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${maven-surefire-plugin.version} - - - org.apache.maven.plugins - maven-jxr-plugin - ${maven-jxr-plugin.version} - - - org.codehaus.mojo - versions-maven-plugin - ${versions.version} - - - - dependency-updates-report - plugin-updates-report - property-updates-report - - - - - - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - From 232c350c2d5e9546cbd2a02e1b1f457e18ac7327 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sun, 24 Dec 2017 22:45:58 +0000 Subject: [PATCH 21/34] Add all-tiles --- README.md | 4 ++++ all/pom.xml | 16 ++++++++++++++++ all/tile.xml | 27 +++++++++++++++++++++++++++ pom.xml | 1 + 4 files changed, 48 insertions(+) create mode 100644 all/pom.xml create mode 100644 all/tile.xml diff --git a/README.md b/README.md index 6088c9d..91b2fbc 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,10 @@ true + net.kemitix.tiles:all-tiles:${kemitix-tiles.version} + + + net.kemitix.tiles:maven-plugins-tile:${kemitix-tiles.version} net.kemitix.tiles:enforcer-tile:${kemitix-tiles.version} net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} diff --git a/all/pom.xml b/all/pom.xml new file mode 100644 index 0000000..557eba1 --- /dev/null +++ b/all/pom.xml @@ -0,0 +1,16 @@ + + + + tiles-parent + net.kemitix.tiles + 0.1.0-SNAPSHOT + ../tiles-parent/pom.xml + + 4.0.0 + + all-tiles + tile + + diff --git a/all/tile.xml b/all/tile.xml new file mode 100644 index 0000000..e6296a5 --- /dev/null +++ b/all/tile.xml @@ -0,0 +1,27 @@ + + + + + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true + + + net.kemitix.tiles:maven-plugins-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:enforcer-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:compiler-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:checkstyle-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:huntbugs-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:pmd-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:digraph-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:testing-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:coverage-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:pitest-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:release-tile:0.1.0-SNAPSHOT + + + + + + diff --git a/pom.xml b/pom.xml index ee552ba..221d48e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ pitest huntbugs pmd + all From 48d577e5dcc72743730cb920d72830b24c01fa27 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sun, 24 Dec 2017 22:46:40 +0000 Subject: [PATCH 22/34] Add maven-wrapper --- .mvn/wrapper/maven-wrapper.properties | 1 + mvnw | 227 ++++++++++++++++++++++++++ mvnw.cmd | 143 ++++++++++++++++ 3 files changed, 371 insertions(+) create mode 100755 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100755 mvnw.cmd diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100755 index 0000000..a447c9f --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..e96ccd5 --- /dev/null +++ b/mvnw @@ -0,0 +1,227 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100755 index 0000000..019bd74 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% From d9a18c5d9c7bbd37f5fd8432e625e2a2b6206525 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 25 Dec 2017 20:32:16 +0000 Subject: [PATCH 23/34] Remove sonatype snapshot repository and pluginRepository --- pom.xml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/pom.xml b/pom.xml index 49ace16..02e43eb 100644 --- a/pom.xml +++ b/pom.xml @@ -47,30 +47,4 @@ - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - false - - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - false - - - - From 9489392e22e73a977d6c631991c90d02341e2888 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Tue, 26 Dec 2017 09:29:52 +0000 Subject: [PATCH 24/34] Update parent for kemitix-maven-tiles to kemitix-parent --- tiles/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tiles/pom.xml b/tiles/pom.xml index 221d48e..e0ba10e 100644 --- a/tiles/pom.xml +++ b/tiles/pom.xml @@ -4,6 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + net.kemitix + kemitix-parent + 5.0.0-SNAPSHOT + net.kemitix.tiles kemitix-maven-tiles 0.1.0-SNAPSHOT From 69714de25c3720762e3da0681d9eea8e0e23253c Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Tue, 26 Dec 2017 09:30:19 +0000 Subject: [PATCH 25/34] Add modules and distributionManagement tags to kemitix-parent --- pom.xml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 02e43eb..5a41e77 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,6 @@ 5.0.0-SNAPSHOT pom - Kemitix Parent Common Parent with preconfigured plugins. @@ -47,4 +46,21 @@ + + tiles + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + From b0ad2b1436c4becf2487ca87235a410955c974e1 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 28 Dec 2017 19:57:33 +0000 Subject: [PATCH 26/34] Remove out-dated description --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5a41e77..44f9ebc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,6 @@ 5.0.0-SNAPSHOT pom - Common Parent with preconfigured plugins. - https://github.com/kemitix/kemitix-parent/issues GitHub Issues From 4cc136d8a505cc6088e97074633a34d67e9bd35e Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 29 Dec 2017 18:33:31 +0000 Subject: [PATCH 27/34] Allow checkstyle config location to be completely overridden --- tiles/checkstyle/tile.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tiles/checkstyle/tile.xml b/tiles/checkstyle/tile.xml index 70126f8..96ea2c7 100644 --- a/tiles/checkstyle/tile.xml +++ b/tiles/checkstyle/tile.xml @@ -5,6 +5,7 @@ 1.24.1 3.3.0 5-complexity + net/kemitix/checkstyle-${ruleset.level}.xml @@ -30,7 +31,7 @@ - net/kemitix/checkstyle-${ruleset.level}.xml + ${checkstyle.ruleset.location} From 7ee0d9ebcd60a620682102ce0ddb2e34f569c659 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 29 Dec 2017 18:34:06 +0000 Subject: [PATCH 28/34] Set code coverage requirements to 100% --- tiles/coverage/tile.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tiles/coverage/tile.xml b/tiles/coverage/tile.xml index 02e7c1d..edbe34e 100644 --- a/tiles/coverage/tile.xml +++ b/tiles/coverage/tile.xml @@ -3,8 +3,8 @@ UTF-8 0.7.9 4.3.0 - 0.50 - 0.80 + 1 + 1 0 From 2a4966fd8421b84699d1ce4820e4ae1fd0b33e48 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 29 Dec 2017 18:34:27 +0000 Subject: [PATCH 29/34] Create source code XRef HTML pages during compile phase --- tiles/maven-plugins/tile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiles/maven-plugins/tile.xml b/tiles/maven-plugins/tile.xml index 1bcea92..923a35d 100644 --- a/tiles/maven-plugins/tile.xml +++ b/tiles/maven-plugins/tile.xml @@ -35,7 +35,7 @@ ${maven-jxr-plugin.version} - package + compile jxr From 7cb672c5a2b7fafc4cb1f6fc5bb7db5aae6b7670 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 29 Dec 2017 18:35:02 +0000 Subject: [PATCH 30/34] Ensure JXR creates XRef HTML pages for PMD to use --- tiles/pmd/tile.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tiles/pmd/tile.xml b/tiles/pmd/tile.xml index febb5a9..f54d0f6 100644 --- a/tiles/pmd/tile.xml +++ b/tiles/pmd/tile.xml @@ -25,6 +25,17 @@ + + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true + + + net.kemitix.tiles:maven-plugins-tile:${kemitix-tiles.version} + + + From c494866e1603ae5498467f5f49f5741be0ea602b Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 29 Dec 2017 18:49:19 +0000 Subject: [PATCH 31/34] PMD will fail build on violations, display errors and always create HTML report --- tiles/pmd/tile.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tiles/pmd/tile.xml b/tiles/pmd/tile.xml index f54d0f6..231f95c 100644 --- a/tiles/pmd/tile.xml +++ b/tiles/pmd/tile.xml @@ -8,6 +8,11 @@ org.apache.maven.plugins maven-pmd-plugin ${maven-pmd-plugin.version} + + true + true + false + pmd From b0e3f4c2af5f1800f4b305ce8c6ad92d85d029fc Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 29 Dec 2017 18:49:54 +0000 Subject: [PATCH 32/34] Rewrite README --- README.md | 266 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 177 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index 5721f4d..bf92baf 100644 --- a/README.md +++ b/README.md @@ -1,54 +1,129 @@ KEMITIX-PARENT ============== -This Maven Parent POM several preconfigured plugins. +* `kemitix-parent` +* `kemitix-maven-tiles` + +## Parent + +A parent POM for my own personal projects. ### Usage -#### Maven - +```xml + net.kemitix kemitix-parent RELEASE +``` -## Versions +### Contents -If you want to override the version or configuration values of any of the -plugins configured by this parent, you can set the following properties to the -desired value. +The POM defines the following items: -* project.build.sourceEncoding -* project.reporting.outputEncoding -* kemitix.build.directory -* kemitix-quality-maven-plugin.version -* lombok.version -* maven-javadoc-plugin.version -* maven-source-plugin.version -* maven-gpg-plugin.version -* maven-deploy-plugin.version -* maven-compiler-plugin.version -* maven-surefire-plugin.version -* maven-failsafe-plugin.version -* maven-jxr-plugin.version -* java.version -* versions.version -* coveralls-maven-plugin.version +* `issueManagement` +* `scm` +* `url` +* `inceptionYear` +* `licenses` +* `developers` +* `distributionManagement` -## Kemitix Quality +The POM sets the following properties: -The [kemitix-quality-maven-plugin](https://github.com/kemitix/kemitix-quality-maven-plugin) -provides several preconfigured quality related plugins. +* `project.reporting.outputEncoding` as `UTF-8` +* `java.version` as `1.8` -N.B. The Kemitix Quality plugin required 100% code instruction coverage and mutation ratio. See the project page for details of adjusting these levels if needed. +## Tiles -## Maven Compiler Plugin +Maven Tiles for preconfigured plugins. These can be used independently of the `kemitix-parent` POM. -The [Maven Compiler Plugin](https://maven.apache.org/plugins/maven-compiler-plugin/) -compiles your sources. +### Usage -### Configuration +```xml + + + 2.10 + 0.1.0-SNAPSHOT + + + + + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true + + + net.kemitix.tiles:all-tiles:${kemitix-tiles.version} + + + + net.kemitix.tiles:maven-plugins-tile:${kemitix-tiles.version} + net.kemitix.tiles:enforcer-tile:${kemitix-tiles.version} + net.kemitix.tiles:compiler-tile:${kemitix-tiles.version} + net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version} + net.kemitix.tiles:huntbugs-tile:${kemitix-tiles.version} + net.kemitix.tiles:pmd-tile:${kemitix-tiles.version} + net.kemitix.tiles:digraph-tile:${kemitix-tiles.version} + net.kemitix.tiles:testing-tile:${kemitix-tiles.version} + net.kemitix.tiles:coverage-tile:${kemitix-tiles.version} + net.kemitix.tiles:pitest-tile:${kemitix-tiles.version} + net.kemitix.tiles:release-tile:${kemitix-tiles.version} + + + + + + +``` + +### Properties + +If you want to override the version or configuration values of any of the plugins configured by the tiles, you can set the following properties to the desired value. + +* `project.build.sourceEncoding` +* `maven-javadoc-plugin.version` +* `maven-source-plugin.version` +* `maven-gpg-plugin.version` +* `maven-deploy-plugin.version` +* `maven-compiler-plugin.version` +* `maven-surefire-plugin.version` +* `maven-failsafe-plugin.version` +* `maven-jxr-plugin.version` +* `java.version` +* `versions.version` +* `coveralls-maven-plugin.version` + +### Maven Plugins Tile + +Sets updated versions for the following `org.apache.maven.plugins`: + +* `maven-clean-plugin` +* `maven-install-plugin` +* `maven-site-plugin` + +Adds an updated version of the `org.codehaus.mojo:versions-maven-plugin` plugin. + +#### Maven JXR Plugin + +The [Maven JXR Plugin](http://maven.apache.org/jxr/maven-jxr-plugin/index.html) produces cross-referenced HTML pages of your source code as part of the `compile` phase in `target/site/xref/`. + +### Enforcer Tile + +Provides the `maven-enforcer-plugin`, performing the `display-info` and `enforce` goals during the `validate` phase. + +Required Maven Version is set by the `required-maven.version` property. + +Required Java Version is set by the `java.version` property. + +### Compiler Tile + +#### Maven Compiler Plugin + +The [Maven Compiler Plugin](https://maven.apache.org/plugins/maven-compiler-plugin/) compiles your sources. Ref: [compile:compile](https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html) @@ -58,101 +133,114 @@ Ref: [compile:compile](https://maven.apache.org/plugins/maven-compiler-plugin/co * target: ${java.version} * encoding: ${project.build.sourceEncoding} -## Maven Surefire Plugin +### Checkstyle Tile -The [Maven Surefire Plugin](http://maven.apache.org/surefire/maven-surefire-plugin/index.html) -runs your Unit Tests. +The [Maven Checkstyle Plugin](https://maven.apache.org/plugins/maven-checkstyle-plugin/) verifies the source code against a Checkstyle ruleset file. -### Configuration +The default ruleset is the level `5-complexity` ruleset from [`kemitix-checkstyle-ruleset`](https://github.com/kemitix/kemitix-checkstyle-ruleset). -No configuration applied beyond the defaults. +To use another level within `kemitix-checkstyle-ruleset`, set the `ruleset.level` property. e.g. `4-tweaks`. -## Maven Failsafe Plugin +To use a different checkstyle ruleset completely, set the `checkstyle.ruleset.location` property. -The [Maven Failsafe Plugin](http://maven.apache.org/surefire/maven-failsafe-plugin/index.html) -runs your Integration Tests. -Runs its [integration-test](http://maven.apache.org/surefire/maven-failsafe-plugin/integration-test-mojo.html) -goal during the `verify` phase. +### Huntbugs Tile -### Configuration +The [Huntbugs Maven Plugin](https://github.com/amaembo/huntbugs) performs a static analysis of the compiled bytecode for common bug patterns during the `verify` phase. -No configuration applied beyond the defaults. +### PMD Tile -## Maven Source Plugin +The [PMD Maven Plugin](https://maven.apache.org/plugins/maven-pmd-plugin/) performs the PMD static code analysis during the `verify` phase. -The [Maven Source Plugin](https://maven.apache.org/plugins/maven-source-plugin/) -bundles your sources into a jar file ready for deployment. +Has a transitive dependency upon the `maven-plugins-tile` and includes it automatically. -Runs its [jar-no-fork](https://maven.apache.org/plugins/maven-source-plugin/jar-no-fork-mojo.html) -goal during the `verify` phase. +### Digraph Tile -### Configuration +The [Digraph Maven Plugin](https://github.com/kemitix/digraph-dependency-maven-plugin/) creates a graphviz diagram of the package dependencies within the source code during the `verify` phase. -No configuration applied beyond the defaults. +Set the property `digraph-dependency.basePackage` to the base of the project to be graphed. The default value is `net.kemitix`. -## Maven Javadoc Plugin +### Testing Tile -The [Maven Javadoc Plugin](https://maven.apache.org/plugins/maven-javadoc-plugin/) -generates your html javadocs and bundles them into a jar file ready for -deployment. +#### Maven Surefire Plugin -Runs its [jar](https://maven.apache.org/plugins/maven-javadoc-plugin/jar-mojo.html) -goal during the `verify` phase. +The [Maven Surefire Plugin](http://maven.apache.org/surefire/maven-surefire-plugin/index.html) runs your Unit Tests during the `test` phase. -### Configuration +### Maven Failsafe Plugin -No configuration applied beyond the defaults. +The [Maven Failsafe Plugin](http://maven.apache.org/surefire/maven-failsafe-plugin/index.html) runs your Integration Tests during the `verify` phase. -## Maven Deploy Plugin +### Coverage Tile -The [Maven Deploy Plugin](https://maven.apache.org/plugins/maven-deploy-plugin/) -uploads your artifacts to a remote repository. +#### Jacoco -### Configuration +The [Jacoco Maven Plugin](http://www.eclemma.org/jacoco/trunk/doc/maven.html) verifies that the test suite meets the required coverage ratios. -No configuration applied beyond the defaults. +The defaults require that all classes, lines and branches be covered by tests. i.e. 100% code coverage. -## Maven JXR Plugin +Set the following properties to set less strict targets: -The [Maven JXR Plugin](http://maven.apache.org/jxr/maven-jxr-plugin/index.html) -produces cross-referenced HTML pages of your source code. +* `jacoco-class-line-covered-ratio` - default = 1 (i.e. 100%) +* `jacoco-class-instruction-covered-ratio` - default = 1 (i.e. 100%) +* `jacoco-class-missed-count-maximum` - default = 0 (i.e. #classes with no tests <= 0) -### Configuration +Classes with names that end in the following are excluded from these limits: -No configuration applied beyond the defaults. +* `Test` +* `IT` +* `Main` +* `Application` +* `Configuration` +* `Immutable` -## Coveralls +#### Coveralls -The [Coveralls Maven Plugin](https://github.com/trautonen/coveralls-maven-plugin) -publishes coverage data to coveralls.io. +The [Coveralls Maven Plugin](https://github.com/trautonen/coveralls-maven-plugin) publishes coverage data to coveralls.io. -### Configuration - -The plugin is not configured to run automatically. It must be initiated manually: +The plugin is not configured to run automatically. It must be initiated manually, and requires the `release` profile to be enabled: ```shell mvn -P release test jacoco:report coveralls:report ``` -#### Requirements +This runs the tests, creates the jacoco report from the tests then uploads the results to http://coveralls.io. -In order to use the plugin: +### Pitest Tile -* *must* enable the `release` profile +#### Mutation Testing -# Distribution Management +The [Pitest Maven Plugin](http://pitest.org/quickstart/maven/) perform mutation test coverage checks during the `verify` phase. -Remote repositories are provided for the Sonatype Nexus Snapshots and Nexus Release -Repositories. See the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) -for information on how to deploy your artifact the Maven Central through -Sonatype. +Code coverage must by 100% and all mutations must result in a test from the test suite failing. -### Changing the Build Directory +Set `pitest.skip` to avoid running the mutation test. -If you want to change the build directory, e.g. from your settings.xml to an SSD -or ram drive, then set the value of the `kemitix.build.directory` to your required -locations. e.g. -` -/mnt/ramdrive/${project.groupId}/${project.artifactId} -` +Set `pitest.coverage` to a value between 0 and 1 to set the allowed ratio of uncovered code. i.e. 0 = 100% code coverage, 0.2 = 80% code coverage + +Set `pitest.mutation` to a value between 0 and 1 to set the allowed mutations to survive the test suite. i.e. 0 = 100% mutations caught, 0.2 = 80% mutations caught + +#### Highwheel Cyclic Analysis + +The [Highwheel Maven Plugin](https://github.com/hcoles/highwheel) detects and visualises class and package cyclic dependencies during the `verify` phase. It also reports on tests that appear to have been orphaned during refactoring. + +The generated report is created in `target/highwheel/`. + +### Release Tile + +The plugins in this Tile are only activated when the `release` profile is enabled. + +#### Maven Source Plugin + +The [Maven Source Plugin](https://maven.apache.org/plugins/maven-source-plugin/) bundles your sources into a jar file ready for deployment. + +Runs its [jar-no-fork](https://maven.apache.org/plugins/maven-source-plugin/jar-no-fork-mojo.html) goal during the `verify` phase. + +#### Maven Javadoc Plugin + +The [Maven Javadoc Plugin](https://maven.apache.org/plugins/maven-javadoc-plugin/) generates your html javadocs and bundles them into a jar file ready for deployment. + +Runs its [jar](https://maven.apache.org/plugins/maven-javadoc-plugin/jar-mojo.html) goal during the `verify` phase. + +#### Maven Deploy Plugin + +The [Maven Deploy Plugin](https://maven.apache.org/plugins/maven-deploy-plugin/) uploads your artifacts to a remote repository. From 4bb4847b29d4850f57d950fbe65ab27845534527 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 30 Dec 2017 18:00:59 +0000 Subject: [PATCH 33/34] Remove duplicate maven wrapper in tiles --- tiles/.mvn/wrapper/maven-wrapper.properties | 1 - tiles/mvnw | 227 -------------------- tiles/mvnw.cmd | 143 ------------ 3 files changed, 371 deletions(-) delete mode 100755 tiles/.mvn/wrapper/maven-wrapper.properties delete mode 100755 tiles/mvnw delete mode 100755 tiles/mvnw.cmd diff --git a/tiles/.mvn/wrapper/maven-wrapper.properties b/tiles/.mvn/wrapper/maven-wrapper.properties deleted file mode 100755 index a447c9f..0000000 --- a/tiles/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip \ No newline at end of file diff --git a/tiles/mvnw b/tiles/mvnw deleted file mode 100755 index e96ccd5..0000000 --- a/tiles/mvnw +++ /dev/null @@ -1,227 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/tiles/mvnw.cmd b/tiles/mvnw.cmd deleted file mode 100755 index 019bd74..0000000 --- a/tiles/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% From 95327c623a84e5568e3d304514007e9d055420f8 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 30 Dec 2017 19:04:22 +0000 Subject: [PATCH 34/34] versions set: kemitix-parent 5.0.0 and kemitix-maven-tiles 0.1.0 --- CHANGELOG | 1 + README.md | 2 +- pom.xml | 2 +- tiles/README.md | 2 +- tiles/all/pom.xml | 2 +- tiles/all/tile.xml | 22 +++++++++++----------- tiles/checkstyle/pom.xml | 2 +- tiles/compiler/pom.xml | 2 +- tiles/coverage/pom.xml | 2 +- tiles/digraph/pom.xml | 2 +- tiles/enforcer/pom.xml | 2 +- tiles/huntbugs/pom.xml | 2 +- tiles/maven-plugins/pom.xml | 2 +- tiles/pitest/pom.xml | 2 +- tiles/pmd/pom.xml | 2 +- tiles/pom.xml | 4 ++-- tiles/release/pom.xml | 2 +- tiles/testing/pom.xml | 2 +- tiles/tiles-parent/pom.xml | 2 +- 19 files changed, 30 insertions(+), 29 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5711008..eb23332 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ CHANGELOG * [BREAKING] Split most configuration out into `kemitix-maven-tiles` * [BREAKING] No longer provide lombok as a dependency +* Add tiles 0.1.0 4.0.0 ----- diff --git a/README.md b/README.md index bf92baf..299f35a 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Maven Tiles for preconfigured plugins. These can be used independently of the `k 2.10 - 0.1.0-SNAPSHOT + 0.1.0 diff --git a/pom.xml b/pom.xml index 44f9ebc..6ba7184 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.kemitix kemitix-parent - 5.0.0-SNAPSHOT + 5.0.0 pom diff --git a/tiles/README.md b/tiles/README.md index 91b2fbc..b5c62da 100644 --- a/tiles/README.md +++ b/tiles/README.md @@ -6,7 +6,7 @@ 2.10 - 0.1.0-SNAPSHOT + 0.1.0 diff --git a/tiles/all/pom.xml b/tiles/all/pom.xml index 557eba1..b8e9635 100644 --- a/tiles/all/pom.xml +++ b/tiles/all/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/all/tile.xml b/tiles/all/tile.xml index e6296a5..683b376 100644 --- a/tiles/all/tile.xml +++ b/tiles/all/tile.xml @@ -8,17 +8,17 @@ true - net.kemitix.tiles:maven-plugins-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:enforcer-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:compiler-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:checkstyle-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:huntbugs-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:pmd-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:digraph-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:testing-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:coverage-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:pitest-tile:0.1.0-SNAPSHOT - net.kemitix.tiles:release-tile:0.1.0-SNAPSHOT + net.kemitix.tiles:maven-plugins-tile:0.1.0 + net.kemitix.tiles:enforcer-tile:0.1.0 + net.kemitix.tiles:compiler-tile:0.1.0 + net.kemitix.tiles:checkstyle-tile:0.1.0 + net.kemitix.tiles:huntbugs-tile:0.1.0 + net.kemitix.tiles:pmd-tile:0.1.0 + net.kemitix.tiles:digraph-tile:0.1.0 + net.kemitix.tiles:testing-tile:0.1.0 + net.kemitix.tiles:coverage-tile:0.1.0 + net.kemitix.tiles:pitest-tile:0.1.0 + net.kemitix.tiles:release-tile:0.1.0 diff --git a/tiles/checkstyle/pom.xml b/tiles/checkstyle/pom.xml index 9313f31..559c84c 100644 --- a/tiles/checkstyle/pom.xml +++ b/tiles/checkstyle/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/compiler/pom.xml b/tiles/compiler/pom.xml index c0d13f9..011c3d1 100644 --- a/tiles/compiler/pom.xml +++ b/tiles/compiler/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/coverage/pom.xml b/tiles/coverage/pom.xml index 7adea36..9c63fc9 100644 --- a/tiles/coverage/pom.xml +++ b/tiles/coverage/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/digraph/pom.xml b/tiles/digraph/pom.xml index 3397798..b840b0a 100644 --- a/tiles/digraph/pom.xml +++ b/tiles/digraph/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/enforcer/pom.xml b/tiles/enforcer/pom.xml index 969c3ba..9da2f75 100644 --- a/tiles/enforcer/pom.xml +++ b/tiles/enforcer/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/huntbugs/pom.xml b/tiles/huntbugs/pom.xml index 43e8a39..5a7686a 100644 --- a/tiles/huntbugs/pom.xml +++ b/tiles/huntbugs/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/maven-plugins/pom.xml b/tiles/maven-plugins/pom.xml index d02012e..f6c182d 100644 --- a/tiles/maven-plugins/pom.xml +++ b/tiles/maven-plugins/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/pitest/pom.xml b/tiles/pitest/pom.xml index 78adf33..4934674 100644 --- a/tiles/pitest/pom.xml +++ b/tiles/pitest/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/pmd/pom.xml b/tiles/pmd/pom.xml index 0ec323d..e219976 100644 --- a/tiles/pmd/pom.xml +++ b/tiles/pmd/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/pom.xml b/tiles/pom.xml index e0ba10e..ca51ded 100644 --- a/tiles/pom.xml +++ b/tiles/pom.xml @@ -7,11 +7,11 @@ net.kemitix kemitix-parent - 5.0.0-SNAPSHOT + 5.0.0 net.kemitix.tiles kemitix-maven-tiles - 0.1.0-SNAPSHOT + 0.1.0 pom diff --git a/tiles/release/pom.xml b/tiles/release/pom.xml index 6da424f..0512285 100644 --- a/tiles/release/pom.xml +++ b/tiles/release/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/testing/pom.xml b/tiles/testing/pom.xml index 686bd33..8005cc9 100644 --- a/tiles/testing/pom.xml +++ b/tiles/testing/pom.xml @@ -5,7 +5,7 @@ tiles-parent net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 ../tiles-parent/pom.xml 4.0.0 diff --git a/tiles/tiles-parent/pom.xml b/tiles/tiles-parent/pom.xml index c39ebaf..ae73fa4 100644 --- a/tiles/tiles-parent/pom.xml +++ b/tiles/tiles-parent/pom.xml @@ -5,7 +5,7 @@ kemitix-maven-tiles net.kemitix.tiles - 0.1.0-SNAPSHOT + 0.1.0 4.0.0