From 4694c35c72cef2884f4b194b73cf81766854a4b2 Mon Sep 17 00:00:00 2001 From: Automated Build Date: Tue, 10 Sep 2024 13:26:35 -0500 Subject: [PATCH 1/6] Update to version 1.1.0-RC-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a470f0a..152d1b4 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ plugins { } group "org.nrg.xnatx.plugins" -version "1.1.0-SNAPSHOT" +version "1.1.0-RC-SNAPSHOT" description "XNAT Pipeline Engine UI Plugin" def pipelineVersion = "1.8.10" From 337078fd56619afbec127a5584db033881869618 Mon Sep 17 00:00:00 2001 From: Will Horton Date: Tue, 24 Sep 2024 20:57:19 +0000 Subject: [PATCH 2/6] PLUGINS-197: Fix Pipeline Tab issue for Member/Collaborator and ensure details tab is always selected for non-owners on project page --- .../templates/screens/xnat_projectData/tabs/Pipelines.vm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 From 4c5abb49359e6879697abbdac29149a2727cc073 Mon Sep 17 00:00:00 2001 From: Automated Build Date: Wed, 25 Sep 2024 15:48:33 -0500 Subject: [PATCH 3/6] Update to version 1.1.0 and parent version 1.9.0 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 152d1b4..0db03da 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { ext { - vXnat = "1.9.0-SNAPSHOT" + vXnat = "1.9.0" vAxis = "1.4" vXmlBeans = "2.6.0" vPlexiViewer = "1.8.10" @@ -31,7 +31,7 @@ plugins { } group "org.nrg.xnatx.plugins" -version "1.1.0-RC-SNAPSHOT" +version "1.1.0" description "XNAT Pipeline Engine UI Plugin" def pipelineVersion = "1.8.10" From a10d9882030e38a79665797dc64587368fea56de Mon Sep 17 00:00:00 2001 From: Bin Zhang Date: Wed, 23 Jul 2025 17:07:53 +0800 Subject: [PATCH 4/6] update version to 1.1.0-java21-RC-SNAPSHOT --- build.gradle | 19 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 0db03da..b1f6f89 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { ext { - vXnat = "1.9.0" + vXnat = "1.10.0-RC-SNAPSHOT" vAxis = "1.4" vXmlBeans = "2.6.0" vPlexiViewer = "1.8.10" @@ -25,13 +25,13 @@ plugins { id "maven-publish" id "com.dorongold.task-tree" version "1.5" id "com.palantir.git-version" version "0.12.1" - id "io.franzbecker.gradle-lombok" version "4.0.0" + id "io.franzbecker.gradle-lombok" version "5.0.0" id "io.spring.dependency-management" version "1.0.11.RELEASE" id "net.linguica.maven-settings" version "0.5" } group "org.nrg.xnatx.plugins" -version "1.1.0" +version "1.1.0-java21-RC-SNAPSHOT" description "XNAT Pipeline Engine UI Plugin" def pipelineVersion = "1.8.10" @@ -48,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) @@ -98,7 +98,6 @@ dependencies { implementation "org.slf4j:slf4j-api" implementation "org.slf4j:slf4j-log4j12" implementation "org.slf4j:jul-to-slf4j" - implementation "log4j:log4j" implementation "net.sourceforge.saxon:saxon" implementAndInclude ("axis:axis:${vAxis}") { transitive = false @@ -226,13 +225,13 @@ jacocoTestReport { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } task sourcesJar(type: Jar, dependsOn: classes) { duplicatesStrategy = DuplicatesStrategy.EXCLUDE - classifier "sources" + archiveClassifier.set "sources" manifest { from gitManifest } @@ -240,7 +239,7 @@ task sourcesJar(type: Jar, dependsOn: classes) { } task javadocJar(type: Jar) { - classifier "javadoc" + archiveClassifier.set "javadoc" manifest { from gitManifest } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a0f7639..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From ff7670886e14f67e41e63371b314fd82c9855d30 Mon Sep 17 00:00:00 2001 From: Bin Zhang Date: Thu, 15 Jan 2026 11:02:49 -0600 Subject: [PATCH 5/6] Add delegate methods to DefaultXnatPipelineLauncher Add setPipelineName(), notify(), and setParameterFile() delegate methods to maintain API compatibility with the original XnatPipelineLauncher interface. Co-Authored-By: Claude Opus 4.5 --- .../component/DefaultXnatPipelineLauncher.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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..4f5e968 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; From 4b94dea24f59294b20321e5bfad4ca83069f9431 Mon Sep 17 00:00:00 2001 From: Bin Zhang Date: Thu, 15 Jan 2026 11:40:48 -0600 Subject: [PATCH 6/6] Add setSupressNotification delegate method to DefaultXnatPipelineLauncher Co-Authored-By: Claude Opus 4.5 --- .../xnatx/pipeline/component/DefaultXnatPipelineLauncher.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 4f5e968..dc287fb 100644 --- a/src/main/java/org/nrg/xnatx/pipeline/component/DefaultXnatPipelineLauncher.java +++ b/src/main/java/org/nrg/xnatx/pipeline/component/DefaultXnatPipelineLauncher.java @@ -88,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