build: release version 1.5.0

kookim · Dec 7, 2023 · db8a049 · db8a049
1 parent 59f368c
commit db8a049
Show file tree

Hide file tree

Showing 46 changed files with 269 additions and 203 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -57,7 +57,7 @@ jobs:
 
       # Build and test
       - name: "Setup Java and Maven"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: ${{matrix.java-version}}
           distribution: 'temurin'

diff --git a/.github/workflows/pull_request_gradle.yml b/.github/workflows/pull_request_gradle.yml
@@ -56,7 +56,7 @@ jobs:
 
       # Build the solver
       - name: "Setup Java and Maven"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'temurin'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'

diff --git a/README.adoc b/README.adoc
@@ -17,6 +17,7 @@ a|* <<school-timetabling, School timetabling>>
 * <<employee-scheduling, Employee Scheduling>>
 * <<food-packaging, Food packaging>>
 * <<vehicle-routing-with-capacity, Vehicle Routing with capacity>>
+* <<vehicle-routing-with-time-windows, Vehicle Routing with time windows>>
 
 a|* link:use-cases/school-timetabling/README.adoc[Quarkus] (Java, Maven or Gradle, Quarkus, H2)
 * link:technology/java-spring-boot/README.adoc[Spring Boot] (Java, Maven or Gradle, Spring Boot, H2)
@@ -122,11 +123,19 @@ image::build/quickstarts-showcase/src/main/resources/META-INF/resources/screensh
 
 === Vehicle Routing with capacity
 
-Find the most efficient routes for a fleet of vehicles.
+Find the most efficient routes for a fleet of vehicles with capacity.
 
-image::build/quickstarts-showcase/src/main/resources/META-INF/resources/screenshot/quarkus-vehicle-routing-screenshot.png[]
+image::build/quickstarts-showcase/src/main/resources/META-INF/resources/screenshot/quarkus-vehicle-routing-capacity-screenshot.png[]
 
-* link:use-cases/vehicle-routing-capacity/README.adoc[Run quarkus-vehicle-routing] (Java, Maven, Quarkus)
+* link:use-cases/vehicle-routing-capacity/README.adoc[Run quarkus-vehicle-routing-capacity] (Java, Maven, Quarkus)
+
+=== Vehicle Routing with time windows
+
+Find the most efficient routes for field service technicians to visits with time windows.
+
+image::build/quickstarts-showcase/src/main/resources/META-INF/resources/screenshot/quarkus-vehicle-routing-time-windows-screenshot.png[]
+
+* link:use-cases/vehicle-routing-time-windows/README.adoc[Run quarkus-vehicle-routing-time-windows] (Java, Maven, Quarkus)
 
 === Timefold examples (desktop)
 

diff --git a/build/quickstarts-showcase/pom.xml b/build/quickstarts-showcase/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ai.timefold.solver</groupId>
     <artifactId>timefold-solver-quickstarts-parent</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/build/quickstarts-showcase/src/main/assembly/assembly-timefold-quickstarts.xml b/build/quickstarts-showcase/src/main/assembly/assembly-timefold-quickstarts.xml
@@ -52,6 +52,13 @@
         <include>quarkus-app/**</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>../../use-cases/vehicle-routing-time-windows/target</directory>
+      <outputDirectory>quickstarts/binaries/use-cases/vehicle-routing-time-windows</outputDirectory>
+      <includes>
+        <include>quarkus-app/**</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>../../use-cases/call-center/target</directory>
       <outputDirectory>quickstarts/binaries/use-cases/call-center</outputDirectory>

diff --git a/...ase/src/main/java/ai/timefold/solver/quickstarts/all/rest/QuickstartLauncherResource.java b/...ase/src/main/java/ai/timefold/solver/quickstarts/all/rest/QuickstartLauncherResource.java
@@ -53,6 +53,7 @@ public void setup(@Observes StartupEvent startupEvent) {
                 new QuickstartMeta("vaccination-scheduling"),
                 new QuickstartMeta("call-center"),
                 new QuickstartMeta("vehicle-routing-capacity"),
+                new QuickstartMeta("vehicle-routing-time-windows"),
                 new QuickstartMeta("order-picking"),
                 new QuickstartMeta("employee-scheduling"),
                 new QuickstartMeta("food-packaging"));

diff --git a/build/quickstarts-showcase/src/main/resources/META-INF/resources/app.js b/build/quickstarts-showcase/src/main/resources/META-INF/resources/app.js
@@ -141,6 +141,9 @@ $(document).ready(function () {
   $("#vehicle-routing-capacity-launch").click(function () {
     launchQuickstart("vehicle-routing-capacity");
   });
+  $("#vehicle-routing-time-windows-launch").click(function () {
+    launchQuickstart("vehicle-routing-time-windows");
+  });
   $("#order-picking-launch").click(function () {
     launchQuickstart("order-picking");
   });

diff --git a/build/quickstarts-showcase/src/main/resources/META-INF/resources/index.html b/build/quickstarts-showcase/src/main/resources/META-INF/resources/index.html
@@ -111,10 +111,10 @@ <h5>
                             Vehicle routing with capacity
                         </h5>
                     </div>
-                    <img src="screenshot/quarkus-vehicle-routing-screenshot.png" class="card-img-top mt-3" alt="Screenshot"/>
+                    <img src="screenshot/quarkus-vehicle-routing-capacity-screenshot.png" class="card-img-top mt-3" alt="Screenshot"/>
                     <div class="card-body">
                         <p class="card-text">
-                            Find the most efficient routes for a fleet of vehicles.
+                            Find the most efficient routes for a fleet of vehicles with capacity.
                         </p>
                         <button id="vehicle-routing-capacity-launch" type="button" class="btn btn-primary w-100">
                             <span class="fas fa-play"></span> Launch
@@ -123,6 +123,26 @@ <h5>
                     </div>
                 </div>
             </div>
+            <div class="col mb-4">
+                <div class="card">
+                    <div class="card-header">
+                        <h5>
+                            <i class="fas fa-truck"></i>
+                            Vehicle routing with time windows
+                        </h5>
+                    </div>
+                    <img src="screenshot/quarkus-vehicle-routing-time-windows-screenshot.png" class="card-img-top mt-3" alt="Screenshot"/>
+                    <div class="card-body">
+                        <p class="card-text">
+                            Find the most efficient routes for field service technicians to visits with time windows.
+                        </p>
+                        <button id="vehicle-routing-time-windows-launch" type="button" class="btn btn-primary w-100">
+                            <span class="fas fa-play"></span> Launch
+                        </button>
+                        <div id="vehicle-routing-time-windows-ports" class="row row-cols-1 row-cols-md-3 mt-3"></div>
+                    </div>
+                </div>
+            </div>
             <div class="col mb-4">
                 <div class="card">
                     <div class="card-header">

diff --git a/...ot/quarkus-vehicle-routing-screenshot.png → ...s-vehicle-routing-capacity-screenshot.png b/...ot/quarkus-vehicle-routing-screenshot.png → ...s-vehicle-routing-capacity-screenshot.png
diff --git a/...TA-INF/resources/screenshot/quarkus-vehicle-routing-time-windows-screenshot.png b/...TA-INF/resources/screenshot/quarkus-vehicle-routing-time-windows-screenshot.png
diff --git a/hello-world/build.gradle b/hello-world/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id "application"
 }
 
-def timefoldVersion = "1.4.0"
+def timefoldVersion = "1.5.0"
 def logbackVersion = "1.4.11"
 def junitJupiterVersion = "5.10.0"
 def assertjVersion = "3.24.2"

diff --git a/hello-world/pom.xml b/hello-world/pom.xml
@@ -12,10 +12,10 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jar.with.dependencies.name>hello-world-run</jar.with.dependencies.name>
 
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
     <version.org.assertj>3.24.2</version.org.assertj>
     <version.org.junit.jupiter>5.10.1</version.org.junit.jupiter>
-    <version.org.logback>1.4.12</version.org.logback>
+    <version.org.logback>1.4.14</version.org.logback>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.surefire.plugin>3.2.2</version.surefire.plugin>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>ai.timefold.solver</groupId>
     <artifactId>timefold-solver-build-parent</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <relativePath/>
   </parent>
   <!-- IMPORTANT: the individual quickstarts have no parent pom. -->

diff --git a/runQuickstartsFromSource.sh b/runQuickstartsFromSource.sh
@@ -4,6 +4,5 @@
 cd "$(dirname $0)" || exit
 
 cd build
-./mvnw -f .. verify -DskipTests &&
-  ./mvnw -f quickstarts-showcase quarkus:dev -Dstartup-open-browser=true
+./mvnw -f quickstarts-showcase quarkus:dev -Dstartup-open-browser=true
 cd ..
diff --git a/technology/java-spring-boot/build.gradle b/technology/java-spring-boot/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id "java"
 }
 
-def timefoldVersion = "1.4.0"
+def timefoldVersion = "1.5.0"
 def assertjVersion = "3.24.2"
 
 group = "org.acme"

diff --git a/technology/java-spring-boot/pom.xml b/technology/java-spring-boot/pom.xml
@@ -11,8 +11,8 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
-    <version.org.springframework.boot>3.1.5</version.org.springframework.boot>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
+    <version.org.springframework.boot>3.2.0</version.org.springframework.boot>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.surefire.plugin>3.2.2</version.surefire.plugin>
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>webjars-locator</artifactId>
-      <version>0.48</version>
+      <version>0.50</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

diff --git a/technology/kotlin-quarkus/pom.xml b/technology/kotlin-quarkus/pom.xml
@@ -11,9 +11,9 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.io.quarkus>3.5.0</version.io.quarkus>
-    <version.kotlin>1.9.20</version.kotlin>
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
+    <version.io.quarkus>3.6.1</version.io.quarkus>
+    <version.kotlin>1.9.21</version.kotlin>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.surefire.plugin>3.2.2</version.surefire.plugin>

diff --git a/use-cases/call-center/pom.xml b/use-cases/call-center/pom.xml
@@ -11,8 +11,8 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.io.quarkus>3.5.0</version.io.quarkus>
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
+    <version.io.quarkus>3.6.1</version.io.quarkus>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.surefire.plugin>3.2.2</version.surefire.plugin>

diff --git a/use-cases/call-center/src/main/java/org/acme/callcenter/domain/CallCenter.java b/use-cases/call-center/src/main/java/org/acme/callcenter/domain/CallCenter.java
@@ -16,7 +16,7 @@ public class CallCenter {
     @ProblemFactCollectionProperty
     private Set<Skill> skills;
 
-    @ProblemFactCollectionProperty
+    @PlanningEntityCollectionProperty
     @ValueRangeProvider
     private List<Agent> agents;
 

diff --git a/use-cases/employee-scheduling/pom.xml b/use-cases/employee-scheduling/pom.xml
@@ -11,8 +11,8 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.io.quarkus>3.5.0</version.io.quarkus>
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
+    <version.io.quarkus>3.6.1</version.io.quarkus>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.surefire.plugin>3.2.2</version.surefire.plugin>

diff --git a/use-cases/facility-location/pom.xml b/use-cases/facility-location/pom.xml
@@ -11,8 +11,8 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.io.quarkus>3.5.0</version.io.quarkus>
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
+    <version.io.quarkus>3.6.1</version.io.quarkus>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.surefire.plugin>3.2.2</version.surefire.plugin>

diff --git a/...lity-location/src/main/java/org/acme/facilitylocation/domain/FacilityLocationProblem.java b/...lity-location/src/main/java/org/acme/facilitylocation/domain/FacilityLocationProblem.java
@@ -9,14 +9,13 @@
 import ai.timefold.solver.core.api.domain.solution.PlanningEntityCollectionProperty;
 import ai.timefold.solver.core.api.domain.solution.PlanningScore;
 import ai.timefold.solver.core.api.domain.solution.PlanningSolution;
-import ai.timefold.solver.core.api.domain.solution.ProblemFactCollectionProperty;
 import ai.timefold.solver.core.api.domain.valuerange.ValueRangeProvider;
 import ai.timefold.solver.core.api.score.buildin.hardsoftlong.HardSoftLongScore;
 
 @PlanningSolution
 public class FacilityLocationProblem {
 
-    @ProblemFactCollectionProperty
+    @PlanningEntityCollectionProperty
     @ValueRangeProvider
     private List<Facility> facilities;
     @PlanningEntityCollectionProperty

diff --git a/use-cases/food-packaging/pom.xml b/use-cases/food-packaging/pom.xml
@@ -11,8 +11,8 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.io.quarkus>3.5.0</version.io.quarkus>
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
+    <version.io.quarkus>3.6.1</version.io.quarkus>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.surefire.plugin>3.2.2</version.surefire.plugin>

diff --git a/use-cases/food-packaging/src/main/java/org/acme/foodpackaging/domain/Job.java b/use-cases/food-packaging/src/main/java/org/acme/foodpackaging/domain/Job.java
@@ -39,9 +39,16 @@ public class Job {
     @JsonIgnore
     @NextElementShadowVariable(sourceVariableName = "jobList")
     private Job nextJob;
+
     /** Start is after cleanup. */
+    @ShadowVariable(variableListenerClass = StartDateTimeUpdatingVariableListener.class, sourceVariableName = "line")
+    @ShadowVariable(variableListenerClass = StartDateTimeUpdatingVariableListener.class, sourceVariableName = "previousJob")
     private LocalDateTime startCleaningDateTime;
+
+    @PiggybackShadowVariable(shadowVariableName = "startCleaningDateTime")
     private LocalDateTime startProductionDateTime;
+
+    @PiggybackShadowVariable(shadowVariableName = "startCleaningDateTime")
     private LocalDateTime endDateTime;
 
     // No-arg constructor required for OptaPlanner and Jackson
@@ -138,9 +145,6 @@ public void setNextJob(Job nextJob) {
         this.nextJob = nextJob;
     }
 
-    // TODO Move this to field after fixing https://github.com/TimefoldAI/timefold-solver/issues/7
-    @ShadowVariable(variableListenerClass = StartDateTimeUpdatingVariableListener.class, sourceVariableName = "line")
-    @ShadowVariable(variableListenerClass = StartDateTimeUpdatingVariableListener.class, sourceVariableName = "previousJob")
     public LocalDateTime getStartCleaningDateTime() {
         return startCleaningDateTime;
     }
@@ -149,8 +153,6 @@ public void setStartCleaningDateTime(LocalDateTime startCleaningDateTime) {
         this.startCleaningDateTime = startCleaningDateTime;
     }
 
-    // TODO Move this to field after fixing https://github.com/TimefoldAI/timefold-solver/issues/7
-    @PiggybackShadowVariable(shadowVariableName = "startCleaningDateTime")
     public LocalDateTime getStartProductionDateTime() {
         return startProductionDateTime;
     }
@@ -159,8 +161,6 @@ public void setStartProductionDateTime(LocalDateTime startProductionDateTime) {
         this.startProductionDateTime = startProductionDateTime;
     }
 
-    // TODO Move this to field after fixing https://github.com/TimefoldAI/timefold-solver/issues/7
-    @PiggybackShadowVariable(shadowVariableName = "startCleaningDateTime")
     public LocalDateTime getEndDateTime() {
         return endDateTime;
     }

diff --git a/use-cases/food-packaging/src/main/java/org/acme/foodpackaging/domain/PackagingSchedule.java b/use-cases/food-packaging/src/main/java/org/acme/foodpackaging/domain/PackagingSchedule.java
@@ -23,7 +23,7 @@ public class PackagingSchedule {
     @PlanningEntityCollectionProperty
     private List<Line> lineList;
 
-    @ProblemFactCollectionProperty
+    @PlanningEntityCollectionProperty
     @ValueRangeProvider
     private List<Job> jobList;
 

diff --git a/use-cases/maintenance-scheduling/pom.xml b/use-cases/maintenance-scheduling/pom.xml
@@ -11,8 +11,8 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.io.quarkus>3.5.0</version.io.quarkus>
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
+    <version.io.quarkus>3.6.1</version.io.quarkus>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.surefire.plugin>3.2.2</version.surefire.plugin>

diff --git a/use-cases/order-picking/pom.xml b/use-cases/order-picking/pom.xml
@@ -11,8 +11,8 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.io.quarkus>3.5.0</version.io.quarkus>
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
+    <version.io.quarkus>3.6.1</version.io.quarkus>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.surefire.plugin>3.2.2</version.surefire.plugin>

diff --git a/use-cases/school-timetabling/build.gradle b/use-cases/school-timetabling/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 def quarkusVersion = "3.3.3"
-def timefoldVersion = "1.4.0"
+def timefoldVersion = "1.5.0"
 def assertjVersion = "3.24.2"
 
 group = "org.acme"

diff --git a/use-cases/school-timetabling/pom.xml b/use-cases/school-timetabling/pom.xml
@@ -11,8 +11,8 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.io.quarkus>3.5.0</version.io.quarkus>
-    <version.ai.timefold.solver>1.4.0</version.ai.timefold.solver>
+    <version.io.quarkus>3.6.1</version.io.quarkus>
+    <version.ai.timefold.solver>1.5.0</version.ai.timefold.solver>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
     <version.resources.plugin>3.3.1</version.resources.plugin>