summaryrefslogtreecommitdiffstats
path: root/common/common-scripts/src/main
diff options
context:
space:
mode:
authorMichal Cmarada <mcmarada@cisco.com>2019-04-10 17:43:54 +0200
committerMichal Cmarada <mcmarada@cisco.com>2019-04-10 17:43:54 +0200
commita7a8f9822082e533096e5bdecc531cbaea0f3931 (patch)
tree0b13a21e2360c273eb3d3593bccc37d6474ffb2b /common/common-scripts/src/main
parent9401e2bf0cd137b0cb57b2ac86cbd643d5460b60 (diff)
HONEYCOMB-448: JAVA 11 support
- updated dependencies - compilation error fixes Change-Id: Iad9d353d06c113a0da892ff11a442e4b41edae0d Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'common/common-scripts/src/main')
-rw-r--r--common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/ModulesListGenerator.groovy6
-rw-r--r--common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/StartupScriptGenerator.groovy2
-rw-r--r--common/common-scripts/src/main/resources/modules/modulesListDefaultContent4
3 files changed, 6 insertions, 6 deletions
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