diff options
Diffstat (limited to 'common/common-scripts')
4 files changed, 7 insertions, 6 deletions
diff --git a/common/common-scripts/pom.xml b/common/common-scripts/pom.xml index 2562e16ed..dfc8c3542 100644 --- a/common/common-scripts/pom.xml +++ b/common/common-scripts/pom.xml @@ -40,6 +40,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> + <type>pom</type> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> diff --git a/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/ModulesListGenerator.groovy b/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/ModulesListGenerator.groovy index 525a77e66..e7a9bfb86 100644 --- a/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/ModulesListGenerator.groovy +++ b/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/ModulesListGenerator.groovy @@ -33,7 +33,7 @@ class ModulesListGenerator { static final def MODULE_LIST_FILE_SUFFIX = "-module-config" static final def SEPARATOR = "," - public static void generate(project, properties, log) { + public static void generate(project, log) { // module configuration file extraction // builds project name from group,artifact and version to prevent overwriting // while building multiple distribution project @@ -42,7 +42,7 @@ class ModulesListGenerator { log.info "Generating list of modules started by distribution ${projectName}" - def activeModules = properties.getProperty(MODULES_LIST_CONTENT_PROPERTY, DEFAULT_MODULES_LIST) + def activeModules = project.properties.get(MODULES_LIST_CONTENT_PROPERTY, DEFAULT_MODULES_LIST) .tokenize(SEPARATOR) .collect { module -> module.trim() } @@ -54,7 +54,7 @@ class ModulesListGenerator { outputPath.toFile().mkdirs() def outputFile = Paths.get(outputPath.toString(), "${projectName}${MODULE_LIST_FILE_SUFFIX}").toFile() - outputFile.createNewFile(); + outputFile.createNewFile() log.info("Writing module configuration for distribution ${projectName} to ${outputPath}") if (activeModules.isEmpty()) { diff --git a/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/StartupScriptGenerator.groovy b/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/StartupScriptGenerator.groovy index 566a90d1f..a8ab4bc73 100644 --- a/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/StartupScriptGenerator.groovy +++ b/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/StartupScriptGenerator.groovy @@ -57,7 +57,7 @@ class StartupScriptGenerator { def jarName = "${project.artifactId}-${project.version}.jar" def jvmParameters = "${additionalJvmParameters} -jar \$(dirname \$0)/${jarName}" - def scriptParent = Paths.get(project.build.outputDirectory, MINIMAL_RESOURCES_FOLDER) + def scriptParent = Paths.get(project.build.outputDirectory as String, MINIMAL_RESOURCES_FOLDER) scriptParent.toFile().mkdirs() def startScriptPath = generateStartupScript(jvmParameters, log, scriptParent, scriptTemplate) diff --git a/common/common-scripts/src/main/resources/modules/modulesListDefaultContent b/common/common-scripts/src/main/resources/modules/modulesListDefaultContent index 32c2bf878..3e5ae8659 100644 --- a/common/common-scripts/src/main/resources/modules/modulesListDefaultContent +++ b/common/common-scripts/src/main/resources/modules/modulesListDefaultContent @@ -2,6 +2,6 @@ // // This distribution does not define any own modules. // In order to do so either distribution.modules property must be defined in distribution pom.xml, -// containing list of desired modules to start, or this file can be directly edited with same effect. +// containing list of desired modules to start or this file can be directly edited with same effect. // -// Note : Modules should be referenced by full class name, e.g: io.fd.test.SampleModule, and separated with comma.
\ No newline at end of file +// Note : Modules should be referenced by full class name. e.g: io.fd.test.SampleModule and separated with comma.
\ No newline at end of file |