From f77a752b5cd5505e09cdf24f573983ed3e5df11b Mon Sep 17 00:00:00 2001 From: mklkun Date: Fri, 23 Sep 2022 11:04:02 +0200 Subject: [PATCH] Increase private key column size and update build.gradle file in SAL --- scheduling-abstraction-layer/build.gradle | 14 ++++++++------ .../java/org/activeeon/morphemic/PAGateway.java | 2 +- .../activeeon/morphemic/model/SSHCredentials.java | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scheduling-abstraction-layer/build.gradle b/scheduling-abstraction-layer/build.gradle index 82553ddf..f9c89347 100644 --- a/scheduling-abstraction-layer/build.gradle +++ b/scheduling-abstraction-layer/build.gradle @@ -31,10 +31,10 @@ javadoc { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' compile group: 'org.apache.commons', name: 'commons-configuration2', version: '2.7' - compile group: 'org.ow2.proactive_grid_cloud_portal', name: 'rest-smartproxy', version: '11.1.0-SNAPSHOT' { + compile group: 'org.ow2.proactive_grid_cloud_portal', name: 'rest-smartproxy', version: '12.0.6' { exclude group: 'org.slf4j', module: 'slf4j-log4j12' } - compile group: 'org.ow2.proactive_grid_cloud_portal', name: 'rest-api', version: '11.1.0-SNAPSHOT' { + compile group: 'org.ow2.proactive_grid_cloud_portal', name: 'rest-api', version: '12.0.6' { exclude group: 'org.slf4j', module: 'slf4j-log4j12' exclude group: 'org.springframework', module: 'spring-expression' exclude group: 'org.springframework', module: 'spring-core' @@ -47,16 +47,18 @@ dependencies { compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.1' compile group: 'org.json', name: 'json', version: '20200518' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' + compile group: 'org.javatuples', name: 'javatuples', version: '1.2' + compile group: 'com.jcraft', name: 'jsch', version: '0.1.55' compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.12.1' compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.1' compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.12.1' compile group: 'org.eclipse.emf', name: 'org.eclipse.emf.common', version: '2.20.0' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.11' compile group: 'org.apache.jclouds.api', name: 'ec2', version: '2.2.1' - annotationProcessor "org.projectlombok:lombok:1.18.12" - compile 'org.junit.jupiter:junit-jupiter:5.6.2' - testImplementation 'org.mockito:mockito-inline:3.7.7' - testImplementation 'org.mockito:mockito-junit-jupiter:3.7.7' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.12' + compile group: 'org.junit.jupiter', name:'junit-jupiter', version: '5.6.2' + testImplementation group: 'org.mockito', name: 'mockito-inline', version: '3.7.7' + testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.7.7' } diff --git a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java index 60134262..9c230921 100644 --- a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java +++ b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java @@ -732,7 +732,7 @@ public class PAGateway { /** * Register new BYON nodes passed as ByonDefinition object * - * @param byonNodeDefinition objects of class ByonDefinition that contains the detials of the nodes to be registered. + * @param byonNodeDefinition objects of class ByonDefinition that contains the details of the nodes to be registered. * @param jobId A constructed job identifier * @param Automate the Byon agent will be deployed automatically if the value is set to True * @return newByonNode ByonNode object that contains information about the registered Node diff --git a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/SSHCredentials.java b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/SSHCredentials.java index a81d2ef9..3350ec39 100644 --- a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/SSHCredentials.java +++ b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/SSHCredentials.java @@ -4,6 +4,7 @@ import lombok.*; import javax.persistence.Column; import javax.persistence.Embeddable; +import javax.persistence.Lob; import java.util.Objects; @AllArgsConstructor @@ -20,7 +21,8 @@ public class SSHCredentials { @Column(name = "KEY_PAIR_NAME") private String keyPairName = null; - @Column(name = "PRIVATE_KEY", columnDefinition = "TEXT") + @Lob + @Column(name = "PRIVATE_KEY") private String privateKey = null; @Override -- GitLab