This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 0ca0b28c27 Upgrade Optaplanner to 8.23.0.Final (#3868)
0ca0b28c27 is described below
commit 0ca0b28c27c87198df49fd377e7cecd32dcaf5f6
Author: James Netherton <jamesnether...@users.noreply.github.com>
AuthorDate: Wed Jun 22 01:39:36 2022 +0100
Upgrade Optaplanner to 8.23.0.Final (#3868)
---
.../optaplanner/it/solver/TimeTableConstraintProvider.java | 10 +++++-----
pom.xml | 2 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 8 ++++----
poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 ++++----
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 ++++----
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/solver/TimeTableConstraintProvider.java
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/solver/TimeTableConstraintProvider.java
index e4a6ba735e..c4920b2332 100644
---
a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/solver/TimeTableConstraintProvider.java
+++
b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/solver/TimeTableConstraintProvider.java
@@ -49,7 +49,7 @@ public class TimeTableConstraintProvider implements
ConstraintProvider {
// A room can accommodate at most one lesson at the same time.
return constraintFactory
// Select each pair of 2 different lessons ...
- .fromUniquePair(Lesson.class,
+ .forEachUniquePair(Lesson.class,
// ... in the same timeslot ...
Joiners.equal(Lesson::getTimeslot),
// ... in the same room ...
@@ -61,7 +61,7 @@ public class TimeTableConstraintProvider implements
ConstraintProvider {
private Constraint teacherConflict(ConstraintFactory constraintFactory) {
// A teacher can teach at most one lesson at the same time.
return constraintFactory
- .fromUniquePair(Lesson.class,
+ .forEachUniquePair(Lesson.class,
Joiners.equal(Lesson::getTimeslot),
Joiners.equal(Lesson::getTeacher))
.penalize("Teacher conflict", HardSoftScore.ONE_HARD);
@@ -70,7 +70,7 @@ public class TimeTableConstraintProvider implements
ConstraintProvider {
private Constraint studentGroupConflict(ConstraintFactory
constraintFactory) {
// A student can attend at most one lesson at the same time.
return constraintFactory
- .fromUniquePair(Lesson.class,
+ .forEachUniquePair(Lesson.class,
Joiners.equal(Lesson::getTimeslot),
Joiners.equal(Lesson::getStudentGroup))
.penalize("Student group conflict", HardSoftScore.ONE_HARD);
@@ -79,7 +79,7 @@ public class TimeTableConstraintProvider implements
ConstraintProvider {
private Constraint teacherRoomStability(ConstraintFactory
constraintFactory) {
// A teacher prefers to teach in a single room.
return constraintFactory
- .fromUniquePair(Lesson.class,
+ .forEachUniquePair(Lesson.class,
Joiners.equal(Lesson::getTeacher))
.filter((lesson1, lesson2) -> lesson1.getRoom() !=
lesson2.getRoom())
.penalize("Teacher room stability", HardSoftScore.ONE_SOFT);
@@ -88,7 +88,7 @@ public class TimeTableConstraintProvider implements
ConstraintProvider {
private Constraint teacherTimeEfficiency(ConstraintFactory
constraintFactory) {
// A teacher prefers to teach sequential lessons and dislikes gaps
between lessons.
return constraintFactory
- .from(Lesson.class)
+ .forEach(Lesson.class)
.join(Lesson.class, Joiners.equal(Lesson::getTeacher),
Joiners.equal((lesson) ->
lesson.getTimeslot().getDayOfWeek()))
.filter((lesson1, lesson2) -> {
diff --git a/pom.xml b/pom.xml
index 9eedc845e0..e8e36c3aef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<camel.sb.docs.branch>camel-spring-boot-${camel.major.minor}.x</camel.sb.docs.branch><!--
The stable camel-spring-boot branch on which our Antora docs depends -->
<cassandra-quarkus.version>1.1.2</cassandra-quarkus.version><!--
https://repo1.maven.org/maven2/com/datastax/oss/quarkus/cassandra-quarkus-bom/
-->
<debezium.version>1.9.2.Final</debezium.version><!-- May go back to
Camel's ${debezium-version} when they are in sync
https://repo1.maven.org/maven2/io/debezium/debezium-bom/ -->
- <optaplanner.version>8.22.1.Final</optaplanner.version><!-- May go
back to Camel's ${optaplanner-version} when they are in sync
https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
+ <optaplanner.version>8.23.0.Final</optaplanner.version><!-- May go
back to Camel's ${optaplanner-version} when they are in sync
https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
<quarkiverse-amazonservices.version>1.1.1</quarkiverse-amazonservices.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/amazonservices/quarkus-amazon-services-parent/
-->
<quarkiverse-artemis.version>1.0.4</quarkiverse-artemis.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/artemis/quarkus-artemis-parent/
-->
<quarkiverse-freemarker.version>0.3.0</quarkiverse-freemarker.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/
-->
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 50c74bd84c..0ee3f20506 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -9993,7 +9993,7 @@
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>8.22.1.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>8.23.0.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10008,7 +10008,7 @@
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>8.22.1.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>8.23.0.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10023,7 +10023,7 @@
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus-jackson</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>8.22.1.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>8.23.0.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10038,7 +10038,7 @@
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus-jackson-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>8.22.1.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>8.23.0.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 76d9152e92..4f307b1d4c 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -9983,7 +9983,7 @@
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</artifactId>
- <version>8.22.1.Final</version>
+ <version>8.23.0.Final</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
@@ -9998,7 +9998,7 @@
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-deployment</artifactId>
- <version>8.22.1.Final</version>
+ <version>8.23.0.Final</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
@@ -10013,7 +10013,7 @@
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson</artifactId>
- <version>8.22.1.Final</version>
+ <version>8.23.0.Final</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
@@ -10028,7 +10028,7 @@
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-deployment</artifactId>
- <version>8.22.1.Final</version>
+ <version>8.23.0.Final</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index a436d25134..8591b25086 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -9983,7 +9983,7 @@
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>8.22.1.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>8.23.0.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -9998,7 +9998,7 @@
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>8.22.1.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>8.23.0.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10013,7 +10013,7 @@
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus-jackson</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>8.22.1.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>8.23.0.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10028,7 +10028,7 @@
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus-jackson-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>8.22.1.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>8.23.0.Final</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
