demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 21:31:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

[archetype] Fix for double modules in bundle pom (#936)

Browse Source 
Due to changes in the archetype maven it generated multi module name with tabs prefixed. This caused the module name to be inserted twice because the added module by maven plugin was not removed when the module is moved by the groovy script.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
This commit is contained in:
Hilbrand Bouwkamp 2019-07-22 13:18:42 +02:00 committed by Christoph Weitkamp
parent 657d63f4f9
commit 5b73b98ded
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/archetype/binding/src/main/resources/META-INF/archetype-post-generate.groovy
View File

@ -82,7 +82,7 @@ def addBundleToBom(bundleAfter, newBundle) {
*/
def fixBundlePom(bundleAfter, newBundle) {
def bomFile = new File(outputDirectory, 'pom.xml')
def module = ' <module>' + newBundle + '</module>'
def module = '<module>' + newBundle + '</module>'
def newContent = ''
def insertIndex = 0;
def lines = bomFile.eachLine { line, index ->
@ -94,7 +94,7 @@ def fixBundlePom(bundleAfter, newBundle) {
insertIndex = index
}
if (insertIndex > 0 && index == insertIndex) {
newContent += module + nl
newContent += ' ' + module + nl
insertIndex = 0
}
}