Sfoglia il codice sorgente

Fix Archetype validation script to use correct path for pom files

Change-Id: I0402807724c8ec911c0af3192f883a49f08d60ac
tags/7.6.0.alpha3
Teemu Suo-Anttila 8 anni fa
parent
commit
17fda4abbc
2 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 4
    3
      scripts/BuildArchetypes.py
  2. 0
    1
      scripts/BuildHelpers.py

+ 4
- 3
scripts/BuildArchetypes.py Vedi File

@@ -13,6 +13,7 @@
import subprocess, sys
from BuildHelpers import mavenValidate, copyWarFiles, getLogFile, mavenCmd, updateRepositories, getArgs, removeDir, parser, resultPath
from DeployHelpers import deployWar
from os.path import join

## DEFAULT VARIABLES ##

@@ -76,7 +77,7 @@ if __name__ == "__main__":
try:
log = getLogFile(archetype)
generateArchetype(archetype, artifactId, args.repo)
updateRepositories(artifactId)
updateRepositories(join(resultPath, artifactId))
mavenValidate(artifactId, logFile=log)
warFiles = copyWarFiles(artifactId, name=archetype)
for war in warFiles:
@@ -86,9 +87,9 @@ if __name__ == "__main__":
print("War %s failed to deploy: %s" % (war, e))
archetypesFailed = True
except Exception as e:
print("Archetype %s build failed" % (archetype, e))
print("Archetype %s build failed:" % (archetype), e)
archetypesFailed = True
removeDir(artifactId)
# removeDir(artifactId)
print("")
if archetypesFailed:
sys.exit(1)

+ 0
- 1
scripts/BuildHelpers.py Vedi File

@@ -105,7 +105,6 @@ def readPomFile(pomFile):
# pom.xml namespace workaround
root = ElementTree.parse(pomFile).getroot()
nameSpace = root.tag[1:root.tag.index('}')]
print("Using namespace: %s" % (nameSpace))
ElementTree.register_namespace('', nameSpace)

# Read the pom.xml correctly

Loading…
Annulla
Salva