Merge remote-tracking branch 'origin/master'

ow2-proactive · May 30, 2024 · e3a119b · e3a119b
2 parents 6570793 + 8da6701
commit e3a119b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
-version=13.1.0-SNAPSHOT
+#Tue, 28 May 2024 12:38:44 +0000
+version=14.1.0-SNAPSHOT
 projectName=scheduling-abstraction-layer
-packageLastPartName=scheduling-abstraction-layer
+packageLastPartName=scheduling-abstraction-layer
diff --git a/sal-common/src/main/java/org/ow2/proactive/sal/model/Cluster.java b/sal-common/src/main/java/org/ow2/proactive/sal/model/Cluster.java
@@ -70,7 +70,7 @@ public class Cluster {
     @JsonProperty("status")
     private String status = "defined";
 
-    @Column(name = "ENV")
+    @Column(name = "ENV", columnDefinition = "text", length = 65535)
     @JsonProperty("env-var-script")
     private String envVars;
 

diff --git a/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ClusterService.java b/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ClusterService.java
@@ -65,7 +65,7 @@ public boolean defineCluster(String sessionId, ClusterDefinition clusterDefiniti
         if (!paGatewayService.isConnectionActive(sessionId)) {
             throw new NotConnectedException();
         }
-        Validate.notNull(clusterDefinition, "The received Byon node definition is empty. Nothing to be defined.");
+        Validate.notNull(clusterDefinition, "The received Cluster definition is empty. Nothing to be defined.");
         LOGGER.info("defineCluster endpoint is called to define the cluster: " + clusterDefinition.getName());
 
         // TODO: