diff --git a/build.gradle b/build.gradle index 8b07512..d22ab1f 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,7 @@ version "1.3.0-SNAPSHOT" description "XNAT Pipeline Engine UI Plugin" def pipelineVersion = "1.8.10" +def pipelineXnatTools = "1.9.0" def pipelineDependencyVersion = "1.0" repositories { @@ -47,9 +48,9 @@ repositories { configurations { all { exclude group: "junit" - exclude group: "net.logstash.logback" + // exclude group: "net.logstash.logback" exclude group: "org.slf4j", module: "log4j-over-slf4j" - exclude group: "org.slf4j", module: "slf4j-log4j12" + // exclude group: "org.slf4j", module: "slf4j-log4j12" exclude group: "org.slf4j", module: "slf4j-simple" } implementation.extendsFrom(implementAndInclude) @@ -139,7 +140,7 @@ dependencies { implementAndInclude ("org.nrg.xnat.pipeline:xnat-pipeline:${pipelineVersion}") { transitive = false } - implementAndInclude ("org.nrg.xnat.pipeline:xnat-tools:${pipelineVersion}"){ + implementAndInclude ("org.nrg.xnat.pipeline:xnat-tools:${pipelineXnatTools}"){ transitive = false } implementAndInclude ("com.lowagie:itext") { diff --git a/src/main/java/org/nrg/xnatx/pipeline/component/DefaultXnatPipelineLauncher.java b/src/main/java/org/nrg/xnatx/pipeline/component/DefaultXnatPipelineLauncher.java index 125bdb5..dc287fb 100644 --- a/src/main/java/org/nrg/xnatx/pipeline/component/DefaultXnatPipelineLauncher.java +++ b/src/main/java/org/nrg/xnatx/pipeline/component/DefaultXnatPipelineLauncher.java @@ -58,6 +58,18 @@ public void setPipelineLaunchParameters(final PipelineLaunchParameters pipelineL this.pipelineLaunchParameters = pipelineLaunchParameters; } + public void setPipelineName(String pipelineName) { + pipelineLaunchParameters.setPipelineName(pipelineName); + } + + public void notify(String... emails) { + pipelineLaunchParameters.notificationEmailId(emails); + } + + public void setParameterFile(String parameterFile) { + pipelineLaunchParameters.setParameterFile(parameterFile); + } + public void setBuildDir(String path) { if (StringUtils.isBlank(path)) { return; @@ -76,7 +88,9 @@ public void setNeedsBuildDir(boolean needsBuildDir) { pipelineLaunchParameters.setNeedsBuildDir(needsBuildDir); } - + public void setSupressNotification(boolean supressNotification) { + pipelineLaunchParameters.setSupressNotification(supressNotification); + } /* * Use this method when you want the job to be executed after schedule diff --git a/src/main/resources/META-INF/resources/templates/screens/xnat_projectData/tabs/Pipelines.vm b/src/main/resources/META-INF/resources/templates/screens/xnat_projectData/tabs/Pipelines.vm index 92aa5eb..ce22e4e 100644 --- a/src/main/resources/META-INF/resources/templates/screens/xnat_projectData/tabs/Pipelines.vm +++ b/src/main/resources/META-INF/resources/templates/screens/xnat_projectData/tabs/Pipelines.vm @@ -122,7 +122,11 @@ #end