From 41b1e1abaea311c4373b1938bc10792b26cda5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20COMPASTI=C3=89?= <maxime.compastie@activeeon.com>
Date: Wed, 30 Dec 2020 12:45:12 +0100
Subject: [PATCH 1/4] Updating lombok and dep version

---
 pom.xml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 685da6f2..a10a7de0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,13 @@
   <artifactId>morphemic-preprocessor</artifactId>
   <version>1.4-SNAPSHOT</version>
   <dependencies>
-    <dependency>
+  <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.12</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
+      <version>1.16.16</version>
+      <scope>provided</scope>
+      </dependency>
+      <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-configuration2</artifactId>
       <version>2.7</version>
@@ -39,19 +39,19 @@
     <dependency>
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
-      <version>1.9.2</version>
+      <version>1.9.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
-      <version>5.4.22.Final</version>
+      <version>5.1.16.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>5.4.22.Final</version>
+      <version>5.1.16.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.11.3</version>
+      <version>2.7.9</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -87,13 +87,18 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.11.3</version>
+      <version>2.7.9</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+     <groupId>org.asynchttpclient</groupId>
+     <artifactId>async-http-client</artifactId>
+     <version>2.12.1</version>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-csv</artifactId>
-      <version>2.11.3</version>
+      <version>2.7.9</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-- 
GitLab


From d7c67ce677158d2cd24d5345beea9a106d3c7ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20COMPASTI=C3=89?= <maxime.compastie@activeeon.com>
Date: Thu, 31 Dec 2020 00:15:54 +0100
Subject: [PATCH 2/4] Correction of Lombok integration in Maven

---
 pom.xml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index a10a7de0..3a81ac6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,13 @@
   <artifactId>morphemic-preprocessor</artifactId>
   <version>1.4-SNAPSHOT</version>
   <dependencies>
-  <dependency>
+    <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.16.16</version>
+      <version>1.18.12</version>
       <scope>provided</scope>
-      </dependency>
-      <dependency>
+    </dependency>
+    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-configuration2</artifactId>
       <version>2.7</version>
@@ -39,19 +39,19 @@
     <dependency>
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
-      <version>1.9.3</version>
+      <version>1.9.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
-      <version>5.1.16.Final</version>
+      <version>5.4.22.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>5.1.16.Final</version>
+      <version>5.4.22.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.7.9</version>
+      <version>2.11.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -87,18 +87,13 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.7.9</version>
+      <version>2.11.3</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-     <groupId>org.asynchttpclient</groupId>
-     <artifactId>async-http-client</artifactId>
-     <version>2.12.1</version>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-csv</artifactId>
-      <version>2.7.9</version>
+      <version>2.11.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-- 
GitLab


From a5cf3ee9291b8b3bae356f1c484017c45988bd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20COMPASTI=C3=89?= <maxime.compastie@activeeon.com>
Date: Thu, 31 Dec 2020 00:18:09 +0100
Subject: [PATCH 3/4] Minor correction in PAGateway configuration

---
 src/main/java/org/activeeon/morphemic/PAGateway.java            | 1 -
 .../morphemic/application/deployment/PASchedulerGateway.java    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/activeeon/morphemic/PAGateway.java b/src/main/java/org/activeeon/morphemic/PAGateway.java
index bab8c4de..80718123 100644
--- a/src/main/java/org/activeeon/morphemic/PAGateway.java
+++ b/src/main/java/org/activeeon/morphemic/PAGateway.java
@@ -15,7 +15,6 @@ import org.json.JSONObject;
 import org.ow2.proactive.resourcemanager.exception.RMException;
 import org.ow2.proactive.scheduler.common.exception.NotConnectedException;
 import org.ow2.proactive.scheduler.common.exception.UserException;
-import org.ow2.proactive.scheduler.common.job.JobId;
 import org.ow2.proactive.scheduler.common.job.JobResult;
 import org.ow2.proactive.scheduler.common.job.JobState;
 import org.ow2.proactive.scheduler.common.job.TaskFlowJob;
diff --git a/src/main/java/org/activeeon/morphemic/application/deployment/PASchedulerGateway.java b/src/main/java/org/activeeon/morphemic/application/deployment/PASchedulerGateway.java
index 9d7183ef..4d7d9fe4 100644
--- a/src/main/java/org/activeeon/morphemic/application/deployment/PASchedulerGateway.java
+++ b/src/main/java/org/activeeon/morphemic/application/deployment/PASchedulerGateway.java
@@ -237,7 +237,7 @@ public class PASchedulerGateway {
                 username,
                 password,
                 null,
-                true);
+                false);
 
         restSmartProxy.init(connectionInfo);
         LOGGER.info("Connected to Scheduler.");
-- 
GitLab


From a9822a3516fd9507582db58f6fd5756e75894b50 Mon Sep 17 00:00:00 2001
From: mklkun <mohamed.khalil.labidi@gmail.com>
Date: Wed, 6 Jan 2021 16:15:16 +0100
Subject: [PATCH 4/4] Revert insecure to true

---
 .../morphemic/application/deployment/PASchedulerGateway.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/activeeon/morphemic/application/deployment/PASchedulerGateway.java b/src/main/java/org/activeeon/morphemic/application/deployment/PASchedulerGateway.java
index 4d7d9fe4..9d7183ef 100644
--- a/src/main/java/org/activeeon/morphemic/application/deployment/PASchedulerGateway.java
+++ b/src/main/java/org/activeeon/morphemic/application/deployment/PASchedulerGateway.java
@@ -237,7 +237,7 @@ public class PASchedulerGateway {
                 username,
                 password,
                 null,
-                false);
+                true);
 
         restSmartProxy.init(connectionInfo);
         LOGGER.info("Connected to Scheduler.");
-- 
GitLab