From 8c28277cfb9e1d2d5d4ffff041ed90a62905314f Mon Sep 17 00:00:00 2001
From: Francisco Javier Tirado Sarti
 <65240126+fjtirado@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:39:55 +0100
Subject: [PATCH] Upgrading py version (#3341)

---
 kogito-build/kogito-dependencies-bom/pom.xml       |  2 +-
 .../pom.xml                                        | 14 ++++++++++++++
 .../requirements.txt                               |  3 +--
 .../PythonFluentWorkflowApplicationTest.java       |  2 --
 quarkus/addons/python/integration-tests/pom.xml    |  4 ++--
 .../kie/kogito/quarkus/workflows/PythonFlowIT.java |  2 --
 .../python/PythonWorkItemHandlerConfig.java        |  8 ++++----
 7 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
index bbec1883ae2..f63fa8b9124 100644
--- a/kogito-build/kogito-dependencies-bom/pom.xml
+++ b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -129,7 +129,7 @@
 
     <!-- see: https://maven.apache.org/surefire/maven-surefire-plugin/examples/fork-options-and-parallel-execution.html#parallel-test-execution-and-single-thread-execution -->
     <version.com.github.stephenc.jcip>1.0-1</version.com.github.stephenc.jcip>
-    <version.black.ninia>4.1.1</version.black.ninia>
+    <version.black.ninia>4.2.0</version.black.ninia>
     <version.com.google.guava>32.0.0-jre</version.com.google.guava>
     <version.apache.commons.commons-compress>1.24.0</version.apache.commons.commons-compress>
   </properties>
diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml
index 21fe3a8dcac..87322dc42e5 100644
--- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml
+++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml
@@ -85,6 +85,20 @@
                 </arguments>
             </configuration>
           </execution>
+          <execution>
+            <id>jep</id>
+            <phase>generate-resources</phase>
+            <goals>
+                <goal>exec</goal>
+            </goals>
+            <configuration>
+                <executable>pip</executable>
+                <arguments>
+                    <argument>install</argument>
+                    <argument>jep==4.2.0</argument>
+                </arguments>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt
index 8e77e5e3523..8434f46c6a1 100644
--- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt
+++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt
@@ -1,2 +1 @@
-numpy>=1.21.0
-jep>=4.1.1
\ No newline at end of file
+numpy>=1.21.0
\ No newline at end of file
diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/src/test/java/org/kie/kogito/serverless/workflow/executor/PythonFluentWorkflowApplicationTest.java b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/src/test/java/org/kie/kogito/serverless/workflow/executor/PythonFluentWorkflowApplicationTest.java
index 578b5acd671..e5305f3dba1 100644
--- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/src/test/java/org/kie/kogito/serverless/workflow/executor/PythonFluentWorkflowApplicationTest.java
+++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/src/test/java/org/kie/kogito/serverless/workflow/executor/PythonFluentWorkflowApplicationTest.java
@@ -21,7 +21,6 @@
 import java.util.Collections;
 import java.util.Map;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.serverless.workflow.fluent.ActionBuilder.ScriptType;
 import org.kie.kogito.serverless.workflow.python.PythonWorkItemHandlerUtils;
@@ -38,7 +37,6 @@
 import static org.kie.kogito.serverless.workflow.fluent.WorkflowBuilder.jsonObject;
 import static org.kie.kogito.serverless.workflow.fluent.WorkflowBuilder.workflow;
 
-@Disabled
 public class PythonFluentWorkflowApplicationTest {
 
     @Test
diff --git a/quarkus/addons/python/integration-tests/pom.xml b/quarkus/addons/python/integration-tests/pom.xml
index 624269309af..c077d2d9123 100644
--- a/quarkus/addons/python/integration-tests/pom.xml
+++ b/quarkus/addons/python/integration-tests/pom.xml
@@ -116,7 +116,7 @@
                 </arguments>
             </configuration>
           </execution>
-           <execution>
+          <execution>
             <id>jep</id>
             <phase>generate-resources</phase>
             <goals>
@@ -126,7 +126,7 @@
                 <executable>pip</executable>
                 <arguments>
                     <argument>install</argument>
-                    <argument>jep</argument>
+                    <argument>jep==4.2.0</argument>
                 </arguments>
             </configuration>
           </execution>
diff --git a/quarkus/addons/python/integration-tests/src/test/java/org/kie/kogito/quarkus/workflows/PythonFlowIT.java b/quarkus/addons/python/integration-tests/src/test/java/org/kie/kogito/quarkus/workflows/PythonFlowIT.java
index 56ce40fffc7..75de1ed8b77 100644
--- a/quarkus/addons/python/integration-tests/src/test/java/org/kie/kogito/quarkus/workflows/PythonFlowIT.java
+++ b/quarkus/addons/python/integration-tests/src/test/java/org/kie/kogito/quarkus/workflows/PythonFlowIT.java
@@ -18,7 +18,6 @@
  */
 package org.kie.kogito.quarkus.workflows;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
@@ -28,7 +27,6 @@
 import static org.hamcrest.CoreMatchers.is;
 
 @QuarkusIntegrationTest
-@Disabled
 class PythonFlowIT {
 
     @Test
diff --git a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
index cfc673a546a..08d4a34e620 100644
--- a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
+++ b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
@@ -18,15 +18,15 @@
  */
 package org.kie.kogito.quarkus.serverless.workflow.python;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
 import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
 import org.kie.kogito.serverless.workflow.python.PythonScriptWorkItemHandler;
 import org.kie.kogito.serverless.workflow.python.PythonServiceWorkItemHandler;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class PythonWorkItemHandlerConfig extends CachedWorkItemHandlerConfig {