From 1eaadc497e28304194e04eb1aeb3a2a8f3d9692b Mon Sep 17 00:00:00 2001 From: Peter Janes Date: Tue, 23 Apr 2019 11:34:24 -0400 Subject: [PATCH 1/7] Fail tile validation if is present. Fixes repaint-io/maven-tiles#94. --- .../groovy/io/repaint/maven/tiles/TileValidator.groovy | 5 +++++ .../io/repaint/maven/tiles/TileValidatorTest.groovy | 2 +- src/test/resources/bad-tile.xml | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy index 61fe8ad..5baf099 100644 --- a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy +++ b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy @@ -112,6 +112,11 @@ class TileValidator { validModel = null } + if (model.build?.extensions) { + log.error("Tile has extensions and must not have") + validModel = null + } + return validModel } } diff --git a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy index aef3ff2..5c85782 100644 --- a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy +++ b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy @@ -31,7 +31,7 @@ class TileValidatorTest { public void testValidation() { new TileValidator().loadModel(logger, new File("src/test/resources/bad-tile.xml"), "") - assert errors.size() == 8 + assert errors.size() == 9 assert warnings.size() == 0 assert infos.size() == 0 } diff --git a/src/test/resources/bad-tile.xml b/src/test/resources/bad-tile.xml index 00d8529..c56b867 100644 --- a/src/test/resources/bad-tile.xml +++ b/src/test/resources/bad-tile.xml @@ -51,5 +51,13 @@ + + + group + artifact + version + + + From 6936e1c5ab718499f773e54165274fe96ed76610 Mon Sep 17 00:00:00 2001 From: Peter Janes Date: Wed, 24 Apr 2019 09:20:50 -0400 Subject: [PATCH 2/7] Fail tile validation when a plugin includes . --- .../groovy/io/repaint/maven/tiles/TileValidator.groovy | 10 ++++++++++ .../io/repaint/maven/tiles/TileValidatorTest.groovy | 2 +- src/test/resources/bad-tile.xml | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy index 5baf099..e9ea50b 100644 --- a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy +++ b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy @@ -117,6 +117,16 @@ class TileValidator { validModel = null } + if (model.build?.plugins) { + for (plugin in model.build.plugins) { + if (plugin.extensions) { + log.error("Tile has plugins with extensions and must not have") + validModel = null + break + } + } + } + return validModel } } diff --git a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy index 5c85782..fb19567 100644 --- a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy +++ b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy @@ -31,7 +31,7 @@ class TileValidatorTest { public void testValidation() { new TileValidator().loadModel(logger, new File("src/test/resources/bad-tile.xml"), "") - assert errors.size() == 9 + assert errors.size() == 10 assert warnings.size() == 0 assert infos.size() == 0 } diff --git a/src/test/resources/bad-tile.xml b/src/test/resources/bad-tile.xml index c56b867..04f1460 100644 --- a/src/test/resources/bad-tile.xml +++ b/src/test/resources/bad-tile.xml @@ -51,6 +51,14 @@ + + + group + artifact + version + true + + group From 3e9f73893000745af9c449fe2514976dd9e1d185 Mon Sep 17 00:00:00 2001 From: Peter Janes Date: Tue, 23 Apr 2019 11:34:24 -0400 Subject: [PATCH 3/7] Fail tile validation if is present. Fixes repaint-io/maven-tiles#94. --- .../groovy/io/repaint/maven/tiles/TileValidator.groovy | 5 +++++ .../io/repaint/maven/tiles/TileValidatorTest.groovy | 2 +- src/test/resources/bad-tile.xml | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy index 61fe8ad..5baf099 100644 --- a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy +++ b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy @@ -112,6 +112,11 @@ class TileValidator { validModel = null } + if (model.build?.extensions) { + log.error("Tile has extensions and must not have") + validModel = null + } + return validModel } } diff --git a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy index aef3ff2..5c85782 100644 --- a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy +++ b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy @@ -31,7 +31,7 @@ class TileValidatorTest { public void testValidation() { new TileValidator().loadModel(logger, new File("src/test/resources/bad-tile.xml"), "") - assert errors.size() == 8 + assert errors.size() == 9 assert warnings.size() == 0 assert infos.size() == 0 } diff --git a/src/test/resources/bad-tile.xml b/src/test/resources/bad-tile.xml index 00d8529..c56b867 100644 --- a/src/test/resources/bad-tile.xml +++ b/src/test/resources/bad-tile.xml @@ -51,5 +51,13 @@ + + + group + artifact + version + + + From 1b5598624d02e2e69302c1da34bebf6d8c77412f Mon Sep 17 00:00:00 2001 From: Peter Janes Date: Wed, 24 Apr 2019 09:20:50 -0400 Subject: [PATCH 4/7] Fail tile validation when a plugin includes . --- .../groovy/io/repaint/maven/tiles/TileValidator.groovy | 10 ++++++++++ .../io/repaint/maven/tiles/TileValidatorTest.groovy | 2 +- src/test/resources/bad-tile.xml | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy index 5baf099..e9ea50b 100644 --- a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy +++ b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy @@ -117,6 +117,16 @@ class TileValidator { validModel = null } + if (model.build?.plugins) { + for (plugin in model.build.plugins) { + if (plugin.extensions) { + log.error("Tile has plugins with extensions and must not have") + validModel = null + break + } + } + } + return validModel } } diff --git a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy index 5c85782..fb19567 100644 --- a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy +++ b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy @@ -31,7 +31,7 @@ class TileValidatorTest { public void testValidation() { new TileValidator().loadModel(logger, new File("src/test/resources/bad-tile.xml"), "") - assert errors.size() == 9 + assert errors.size() == 10 assert warnings.size() == 0 assert infos.size() == 0 } diff --git a/src/test/resources/bad-tile.xml b/src/test/resources/bad-tile.xml index c56b867..04f1460 100644 --- a/src/test/resources/bad-tile.xml +++ b/src/test/resources/bad-tile.xml @@ -51,6 +51,14 @@ + + + group + artifact + version + true + + group From 33236b8f6bb590434bc8e97f50515ac3dd051564 Mon Sep 17 00:00:00 2001 From: Peter Janes Date: Tue, 23 Apr 2019 11:34:24 -0400 Subject: [PATCH 5/7] Fail tile validation if is present. Fixes repaint-io/maven-tiles#94. --- .../groovy/io/repaint/maven/tiles/TileValidator.groovy | 5 +++++ .../io/repaint/maven/tiles/TileValidatorTest.groovy | 2 +- src/test/resources/bad-tile.xml | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy index 61fe8ad..5baf099 100644 --- a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy +++ b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy @@ -112,6 +112,11 @@ class TileValidator { validModel = null } + if (model.build?.extensions) { + log.error("Tile has extensions and must not have") + validModel = null + } + return validModel } } diff --git a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy index aef3ff2..5c85782 100644 --- a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy +++ b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy @@ -31,7 +31,7 @@ class TileValidatorTest { public void testValidation() { new TileValidator().loadModel(logger, new File("src/test/resources/bad-tile.xml"), "") - assert errors.size() == 8 + assert errors.size() == 9 assert warnings.size() == 0 assert infos.size() == 0 } diff --git a/src/test/resources/bad-tile.xml b/src/test/resources/bad-tile.xml index 00d8529..c56b867 100644 --- a/src/test/resources/bad-tile.xml +++ b/src/test/resources/bad-tile.xml @@ -51,5 +51,13 @@ + + + group + artifact + version + + + From a2ebcf621688f2f734c32fac3cf76a9f46eeadc8 Mon Sep 17 00:00:00 2001 From: Peter Janes Date: Wed, 24 Apr 2019 09:20:50 -0400 Subject: [PATCH 6/7] Fail tile validation when a plugin includes . --- .../groovy/io/repaint/maven/tiles/TileValidator.groovy | 10 ++++++++++ .../io/repaint/maven/tiles/TileValidatorTest.groovy | 2 +- src/test/resources/bad-tile.xml | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy index 5baf099..e9ea50b 100644 --- a/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy +++ b/src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy @@ -117,6 +117,16 @@ class TileValidator { validModel = null } + if (model.build?.plugins) { + for (plugin in model.build.plugins) { + if (plugin.extensions) { + log.error("Tile has plugins with extensions and must not have") + validModel = null + break + } + } + } + return validModel } } diff --git a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy index 5c85782..fb19567 100644 --- a/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy +++ b/src/test/groovy/io/repaint/maven/tiles/TileValidatorTest.groovy @@ -31,7 +31,7 @@ class TileValidatorTest { public void testValidation() { new TileValidator().loadModel(logger, new File("src/test/resources/bad-tile.xml"), "") - assert errors.size() == 9 + assert errors.size() == 10 assert warnings.size() == 0 assert infos.size() == 0 } diff --git a/src/test/resources/bad-tile.xml b/src/test/resources/bad-tile.xml index c56b867..04f1460 100644 --- a/src/test/resources/bad-tile.xml +++ b/src/test/resources/bad-tile.xml @@ -51,6 +51,14 @@ + + + group + artifact + version + true + + group From 69189edb45e5c28003d42583cc7bca1756c909c0 Mon Sep 17 00:00:00 2001 From: Peter Janes Date: Tue, 23 Apr 2019 11:34:24 -0400 Subject: [PATCH 7/7] Fail tile validation if is present. Fixes repaint-io/maven-tiles#94. --- src/test/resources/bad-tile.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/resources/bad-tile.xml b/src/test/resources/bad-tile.xml index 04f1460..aa1279a 100644 --- a/src/test/resources/bad-tile.xml +++ b/src/test/resources/bad-tile.xml @@ -51,14 +51,14 @@ - - - group - artifact - version - true - - + + + group + artifact + version + true + + group