Skip to content

Commit

Permalink
Merge branch 'peterjanes-fail-on-extensions'
Browse files Browse the repository at this point in the history
* peterjanes-fail-on-extensions:
  Fail tile validation if <build><extensions> is present.
  Fail tile validation when a plugin includes <extensions>.
  Fail tile validation if <build><extensions> is present.
  Fail tile validation when a plugin includes <extensions>.
  Fail tile validation if <build><extensions> is present.
  Fail tile validation when a plugin includes <extensions>.
  Fail tile validation if <build><extensions> is present.

Change-Id: Ib45c6308be0e09f7e9a3e4a65fa40b5076f3b15c
  • Loading branch information
talios committed Apr 25, 2019
2 parents e570866 + 1cf0be4 commit af2a7c7
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
15 changes: 15 additions & 0 deletions src/main/groovy/io/repaint/maven/tiles/TileValidator.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,21 @@ class TileValidator {
validModel = null
}

if (model.build?.extensions) {
log.error("Tile has extensions and must not have")
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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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() == 10
assert warnings.size() == 0
assert infos.size() == 0
}
Expand Down
16 changes: 16 additions & 0 deletions src/test/resources/bad-tile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,21 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>group</groupId>
<artifactId>artifact</artifactId>
<version>version</version>
<extensions>true</extensions>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>group</groupId>
<artifactId>artifact</artifactId>
<version>version</version>
</extension>
</extensions>
</build>

</project>

0 comments on commit af2a7c7

Please sign in to comment.