This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-3.9.0-upgrade
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 76282a73d31f53acc00cd12fb9fe4cf2fce243d6
Author: Zineb Bendhiba <bendhiba.zi...@gmail.com>
AuthorDate: Tue Feb 16 11:52:48 2021 +0100
Optaplanner : upgrade to 8.x extension #2243
---
extensions/optaplanner/deployment/pom.xml | 16 ++++-----------
.../deployment/OptaplannerProcessor.java | 2 --
extensions/optaplanner/runtime/pom.xml | 4 ++++
integration-tests/optaplanner/pom.xml | 4 ----
.../optaplanner/it/bootstrap/DataGenerator.java | 2 +-
.../component/optaplanner/it/domain/Lesson.java | 7 -------
.../component/optaplanner/it/domain/Room.java | 6 ------
.../component/optaplanner/it/domain/Timeslot.java | 7 -------
pom.xml | 2 +-
poms/bom/pom.xml | 23 +++++++++++-----------
10 files changed, 22 insertions(+), 51 deletions(-)
diff --git a/extensions/optaplanner/deployment/pom.xml
b/extensions/optaplanner/deployment/pom.xml
index 18f4640..f5882b2 100644
--- a/extensions/optaplanner/deployment/pom.xml
+++ b/extensions/optaplanner/deployment/pom.xml
@@ -29,18 +29,6 @@
<artifactId>camel-quarkus-optaplanner-deployment</artifactId>
<name>Camel Quarkus :: OptaPlanner :: Deployment</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.optaplanner</groupId>
- <artifactId>optaplanner-quarkus-deployment</artifactId>
- <version>${optaplanner.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -54,6 +42,10 @@
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-deployment</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus-jackson-deployment</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git
a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
index 3956d43..140c65b 100644
---
a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
+++
b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
@@ -18,11 +18,9 @@ package
org.apache.camel.quarkus.component.optaplanner.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.jboss.logging.Logger;
class OptaplannerProcessor {
- private static final Logger LOG =
Logger.getLogger(OptaplannerProcessor.class);
private static final String FEATURE = "camel-optaplanner";
@BuildStep
diff --git a/extensions/optaplanner/runtime/pom.xml
b/extensions/optaplanner/runtime/pom.xml
index 180c6e0c..e8a5a83 100644
--- a/extensions/optaplanner/runtime/pom.xml
+++ b/extensions/optaplanner/runtime/pom.xml
@@ -60,6 +60,10 @@
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus-jackson</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/integration-tests/optaplanner/pom.xml
b/integration-tests/optaplanner/pom.xml
index ad1aed3..45d2c78 100644
--- a/integration-tests/optaplanner/pom.xml
+++ b/integration-tests/optaplanner/pom.xml
@@ -48,10 +48,6 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jackson</artifactId>
</dependency>
<dependency>
diff --git
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/bootstrap/DataGenerator.java
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/bootstrap/DataGenerator.java
index 7538aeb..b162933 100644
---
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/bootstrap/DataGenerator.java
+++
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/bootstrap/DataGenerator.java
@@ -32,7 +32,7 @@ import
org.apache.camel.quarkus.component.optaplanner.it.domain.Timeslot;
/**
* adapted from optaplanner quarkus quickstart :
- *
https://github.com/quarkusio/quarkus-quickstarts/blob/master/optaplanner-quickstart/src/main/java/org/acme/optaplanner/bootstrap/DemoDataGenerator.java
+ *
https://github.com/kiegroup/optaplanner-quickstarts/blob/stable/quarkus-school-timetabling/src/main/java/org/acme/schooltimetabling/bootstrap/DemoDataGenerator.java
*/
@ApplicationScoped
public class DataGenerator {
diff --git
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Lesson.java
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Lesson.java
index c749745..03db29e 100644
---
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Lesson.java
+++
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Lesson.java
@@ -18,9 +18,6 @@ package
org.apache.camel.quarkus.component.optaplanner.it.domain;
import java.util.concurrent.atomic.AtomicLong;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
import org.optaplanner.core.api.domain.entity.PlanningEntity;
import org.optaplanner.core.api.domain.lookup.PlanningId;
import org.optaplanner.core.api.domain.variable.PlanningVariable;
@@ -33,14 +30,10 @@ import
org.optaplanner.core.api.domain.variable.PlanningVariable;
public class Lesson {
@PlanningId
- @NotNull
private Long id;
- @NotBlank
private String subject;
- @NotBlank
private String teacher;
- @NotBlank
private String studentGroup;
@PlanningVariable(valueRangeProviderRefs = "timeslotRange")
diff --git
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Room.java
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Room.java
index 4fed920..a7a5deb 100644
---
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Room.java
+++
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Room.java
@@ -18,9 +18,6 @@ package
org.apache.camel.quarkus.component.optaplanner.it.domain;
import java.util.concurrent.atomic.AtomicLong;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
import org.optaplanner.core.api.domain.lookup.PlanningId;
/**
@@ -30,10 +27,7 @@ import org.optaplanner.core.api.domain.lookup.PlanningId;
public class Room {
@PlanningId
- @NotNull
private Long id;
-
- @NotBlank
private String name;
private static AtomicLong increment = new AtomicLong(1);
diff --git
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Timeslot.java
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Timeslot.java
index a14a5f4..1d44ef6 100644
---
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Timeslot.java
+++
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Timeslot.java
@@ -20,8 +20,6 @@ import java.time.DayOfWeek;
import java.time.LocalTime;
import java.util.concurrent.atomic.AtomicLong;
-import javax.validation.constraints.NotNull;
-
import org.optaplanner.core.api.domain.lookup.PlanningId;
/**
@@ -31,14 +29,9 @@ import org.optaplanner.core.api.domain.lookup.PlanningId;
public class Timeslot {
@PlanningId
- @NotNull
private Long id;
-
- @NotNull
private DayOfWeek dayOfWeek;
- @NotNull
private LocalTime startTime;
- @NotNull
private LocalTime endTime;
private static AtomicLong increment = new AtomicLong(1);
diff --git a/pom.xml b/pom.xml
index 4e965e4..03e1740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
<nimbus-jose-jwt.version>4.41.1</nimbus-jose-jwt.version><!-- Mess in
hdfs transitive deps -->
<okhttp.version>${squareup-okhttp-version}</okhttp.version><!-- keep
in sync with okio -->
<okio.version>${squareup-okio-version}</okio.version><!-- keep in sync
with okhttp -->
- <optaplanner.version>7.46.0.Final</optaplanner.version>
+ <optaplanner.version>8.2.0.Final</optaplanner.version>
<quarkiverse.freemarker.version>0.2.2</quarkiverse.freemarker.version>
<quarkiverse-minio.version>0.2.0</quarkiverse-minio.version>
<quarkus.version>1.13.0.Final</quarkus.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 893e8da..993dfa7 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -5866,16 +5867,6 @@
<version>${jsoup.version}</version>
</dependency>
<dependency>
- <groupId>org.kie.soup</groupId>
- <artifactId>kie-soup-commons</artifactId>
- <version>${optaplanner.version}</version>
- </dependency>
- <dependency>
- <groupId>org.kie.soup</groupId>
- <artifactId>kie-soup-project-datamodel-commons</artifactId>
- <version>${optaplanner.version}</version>
- </dependency>
- <dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>${mvel2.version}</version>
@@ -5891,6 +5882,16 @@
<version>${optaplanner.version}</version>
</dependency>
<dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus-jackson</artifactId>
+ <version>${optaplanner.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus-jackson-deployment</artifactId>
+ <version>${optaplanner.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
