This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 20c83797e50b9278276a35affb42099ea7c1e7a6
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Mon Oct 5 18:26:57 2020 +0200
Fixup Optaplanner native support, simplify dependency management
---
extensions/optaplanner/runtime/pom.xml | 25 -------------------------
pom.xml | 2 +-
poms/bom/pom.xml | 15 +++++++++++++++
3 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/extensions/optaplanner/runtime/pom.xml
b/extensions/optaplanner/runtime/pom.xml
index 5c5fdda..a536170 100644
--- a/extensions/optaplanner/runtime/pom.xml
+++ b/extensions/optaplanner/runtime/pom.xml
@@ -44,20 +44,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.optaplanner</groupId>
- <artifactId>optaplanner-quarkus</artifactId>
- <version>${optaplanner.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>${mvel2.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -73,17 +59,6 @@
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- delete mvel2 dependency when optaplanner 7.45.0.Final is
released-->
- <dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index c9f9042..fbcb26b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
<kubernetes-client.version>4.10.3</kubernetes-client.version>
<kotlin.version>1.3.72</kotlin.version>
<netty3.version>3.10.6.Final</netty3.version><!-- Spark -->
+ <mvel2.version>2.4.10.Final</mvel2.version><!-- keep in sync with
Camel and Optaplanner -->
<nimbus-jose-jwt.version>4.41.1</nimbus-jose-jwt.version><!-- Mess in
hdfs transitive deps -->
<okhttp.version>3.14.6</okhttp.version><!-- keep in sync with okio -->
<okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
@@ -117,7 +118,6 @@
<istack-commons-runtime.version>3.0.10</istack-commons-runtime.version>
<jakarta.mail.version>1.6.5</jakarta.mail.version>
<mock-javamail.version>1.9</mock-javamail.version>
- <mvel2.version>2.4.8.Final</mvel2.version>
<pdfbox.version>2.0.21</pdfbox.version>
<slf4j-log4j12.version>1.7.30</slf4j-log4j12.version><!-- Mess in the
transitive dependencies of hbase-testing-util -->
<sshd.version>2.3.0</sshd.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 6435c1d..012b80d 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5652,6 +5652,21 @@
<version>${jcodings.version}</version>
</dependency>
<dependency>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel2</artifactId>
+ <version>${mvel2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus</artifactId>
+ <version>${optaplanner.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus-deployment</artifactId>
+ <version>${optaplanner.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
