This is an automated email from the ASF dual-hosted git repository.
fjtiradosarti pushed a commit to branch 1.40.x
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/1.40.x by this push:
new c24af38a5b 1.40.x fixing guava python library (#3265)
c24af38a5b is described below
commit c24af38a5b04e51c2ee5e50ecd5bd5f23bce1911
Author: Francisco Javier Tirado Sarti
<[email protected]>
AuthorDate: Thu Oct 26 16:49:51 2023 +0200
1.40.x fixing guava python library (#3265)
* Fixing guava vulnerability (#3113)
* Fixing guava vulnerability
See https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-2976
* Update kogito-build/kogito-dependencies-bom/pom.xml
Co-authored-by: Ricardo Zanini
<[email protected]>
---------
Co-authored-by: Ricardo Zanini
<[email protected]>
* [KOGITO-9434] Moving python modules under python profile (#3091)
* [KOGITO-9434] Moving python modules under python profile
* [KOGITO-9434] Renaming to full from python
* [KOGITO-9434] Adding activation properties
* [KOGITO-9434] Installing numpy and jep through maven
* [KOGITO-9434] Update executor tests
---------
Co-authored-by: Ricardo Zanini
<[email protected]>
---
.ci/jenkins/Jenkinsfile.deploy | 1 +
.ci/jenkins/Jenkinsfile.sonarcloud | 2 +-
kogito-build/kogito-dependencies-bom/pom.xml | 7 ++++++
.../pom.xml | 26 ++++++++++++++++++++++
.../requirements.txt | 2 ++
kogito-serverless-workflow/pom.xml | 14 ++++++++++--
quarkus/addons/pom.xml | 11 +++++++++
quarkus/addons/python/integration-tests/pom.xml | 21 +++++++++++++++++
.../python/integration-tests/requirements.txt | 2 ++
9 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 18437c26ba..d26c424961 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -109,6 +109,7 @@ pipeline {
dir(getRepoName()) {
String mvnCmd = getMavenCommand()
.withProperty('maven.test.failure.ignore', true)
+ .withProfiles(['full'])
.skipTests(params.SKIP_TESTS)
.getFullRunCommand('clean install')
util.runWithPythonVirtualEnv(mvnCmd, 'swf')
diff --git a/.ci/jenkins/Jenkinsfile.sonarcloud
b/.ci/jenkins/Jenkinsfile.sonarcloud
index ab611b91b1..a7b5874915 100644
--- a/.ci/jenkins/Jenkinsfile.sonarcloud
+++ b/.ci/jenkins/Jenkinsfile.sonarcloud
@@ -33,7 +33,7 @@ pipeline {
steps {
script {
util.runWithPythonVirtualEnv(getMavenCommand()
- .withProfiles(['run-code-coverage'])
+ .withProfiles(['run-code-coverage', 'full'])
.getFullRunCommand('clean install'),
'swf')
}
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml
b/kogito-build/kogito-dependencies-bom/pom.xml
index 700f11a2e6..bdcc5c9f96 100644
--- a/kogito-build/kogito-dependencies-bom/pom.xml
+++ b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -123,10 +123,17 @@
<!-- 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.com.google.guava>32.0.1-jre</version.com.google.guava>
</properties>
<dependencyManagement>
<dependencies>
+ <!-- Guava should not be used directly by Kogito, here we are managing
it to override dependency added by GRPC to fix this CVE:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-2976 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${version.com.google.guava}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
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 bdf373927e..4f8458a651 100644
---
a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml
+++
b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml
@@ -43,4 +43,30 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pip-install</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>pip</executable>
+ <arguments>
+ <argument>install</argument>
+ <argument>-r</argument>
+ <argument>${project.basedir}/requirements.txt</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git
a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt
b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt
new file mode 100644
index 0000000000..8e77e5e352
--- /dev/null
+++
b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt
@@ -0,0 +1,2 @@
+numpy>=1.21.0
+jep>=4.1.1
\ No newline at end of file
diff --git a/kogito-serverless-workflow/pom.xml
b/kogito-serverless-workflow/pom.xml
index 1abf68f9d8..6d7ed78c00 100644
--- a/kogito-serverless-workflow/pom.xml
+++ b/kogito-serverless-workflow/pom.xml
@@ -44,11 +44,21 @@
</property>
</activation>
<modules>
- <module>kogito-serverless-workflow-python-runtime</module>
<module>kogito-serverless-workflow-executor</module>
- <module>kogito-serverless-workflow-executor-python</module>
<module>kogito-serverless-workflow-executor-tests</module>
</modules>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>full</name>
+ </property>
+ </activation>
+ <modules>
+ <module>kogito-serverless-workflow-python-runtime</module>
+ <module>kogito-serverless-workflow-executor-python</module>
+ </modules>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/quarkus/addons/pom.xml b/quarkus/addons/pom.xml
index 72a22b9ebb..a77c94d964 100644
--- a/quarkus/addons/pom.xml
+++ b/quarkus/addons/pom.xml
@@ -50,6 +50,17 @@
<module>python</module>
</modules>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>full</name>
+ </property>
+ </activation>
+ <modules>
+ <module>python</module>
+ </modules>
+ </profile>
</profiles>
<build>
diff --git a/quarkus/addons/python/integration-tests/pom.xml
b/quarkus/addons/python/integration-tests/pom.xml
index 9ef6cea579..4af1d372f9 100644
--- a/quarkus/addons/python/integration-tests/pom.xml
+++ b/quarkus/addons/python/integration-tests/pom.xml
@@ -76,6 +76,27 @@
</goals>
</execution>
</executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pip-install</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>pip</executable>
+ <arguments>
+ <argument>install</argument>
+ <argument>-r</argument>
+ <argument>${project.basedir}/requirements.txt</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/quarkus/addons/python/integration-tests/requirements.txt
b/quarkus/addons/python/integration-tests/requirements.txt
new file mode 100644
index 0000000000..8e77e5e352
--- /dev/null
+++ b/quarkus/addons/python/integration-tests/requirements.txt
@@ -0,0 +1,2 @@
+numpy>=1.21.0
+jep>=4.1.1
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
