This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a commit to branch agent-framewok-refactoring
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/agent-framewok-refactoring by
this push:
new a7da883b69 updated the groovy library version and slurm groovy script
a7da883b69 is described below
commit a7da883b6985d1699ed61c9cb501ce37d6fda070
Author: lahiruj <[email protected]>
AuthorDate: Mon Dec 9 13:46:03 2024 -0500
updated the groovy library version and slurm groovy script
---
modules/airavata-helix/helix-spectator/pom.xml | 2 +-
.../configuration/server/src/main/resources/SLURM_Groovy.template | 6 +++++-
pom.xml | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/modules/airavata-helix/helix-spectator/pom.xml
b/modules/airavata-helix/helix-spectator/pom.xml
index 2c501e6f71..44fae2519f 100644
--- a/modules/airavata-helix/helix-spectator/pom.xml
+++ b/modules/airavata-helix/helix-spectator/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-templates</artifactId>
- <version>2.4.7</version>
+ <version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
diff --git
a/modules/configuration/server/src/main/resources/SLURM_Groovy.template
b/modules/configuration/server/src/main/resources/SLURM_Groovy.template
index c09ae1be67..a7c521d6eb 100644
--- a/modules/configuration/server/src/main/resources/SLURM_Groovy.template
+++ b/modules/configuration/server/src/main/resources/SLURM_Groovy.template
@@ -2,7 +2,11 @@
# SLURM job submission script generated by Apache Airavata
<%
- def checkCommand = {items, prefix -> for (it in items) if
(it.startsWith(prefix)) return it}
+ def checkCommand = { items, prefix ->
+ items.find { item ->
+ item instanceof String && item.startsWith(prefix as String)
+ }
+ }
def extQueue = checkCommand(preJobCommands, '#SBATCH -p')
def rmQueue = checkCommand(preJobCommands, 'RM #SBATCH -p')
diff --git a/pom.xml b/pom.xml
index 036c4bf250..a9aa8dd98d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<surefire.version>3.0.0-M4</surefire.version>
<junit.version>4.12</junit.version>
<curator.version>5.7.0</curator.version>
- <groovy.version>2.4.7</groovy.version>
+ <groovy.version>3.0.23</groovy.version>
<xpp3.version>1.1.6</xpp3.version>
<xpp5.version>1.2.8</xpp5.version>
<xsul.version>2.10.7</xsul.version>
