chore: release version 1.1.0

.github/dependabot.yml

@@ -8,7 +8,7 @@ updates:
     open-pull-requests-limit: 10
     target-branch: "development"
     commit-message:
-      prefix: "build: "
+      prefix: "deps: "
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/release.yml

@@ -83,7 +83,10 @@ jobs:
         run: |
           git checkout ${{ github.event.inputs.stableBranch }}
           git checkout -B ${{ github.event.inputs.releaseBranch }}-bump
-          git merge -X theirs --squash ${{ github.event.inputs.releaseBranch }}
+          git checkout ${{ github.event.inputs.releaseBranch }}
+          git merge -s ours --no-edit ${{ github.event.inputs.stableBranch }}
+          git checkout ${{ github.event.inputs.releaseBranch }}-bump
+          git merge --squash ${{ github.event.inputs.releaseBranch }}
           git commit -m "chore: release version ${{ github.event.inputs.version }}"
           git push origin ${{ github.event.inputs.releaseBranch }}-bump
           gh pr create --reviewer triceo,ge0ffrey --base ${{ github.event.inputs.stableBranch }} --head ${{ github.event.inputs.releaseBranch }}-bump --title "chore: release version ${{ github.event.inputs.version }}" --body-file .github/workflows/release-pr-body-stable.md

.gitignore

@@ -1,5 +1,4 @@
-/target
-/local
+target
 
 # Eclipse, Netbeans and IntelliJ files
 /.*
@@ -8,9 +7,9 @@
 !.gitattributes
 !/.mvn
 /nbproject
-/*.ipr
-/*.iws
-/*.iml
+*.ipr
+*.iws
+*.iml
 
 # Repository wide ignore mac DS_Store files
 .DS_Store

README.adoc

@@ -20,7 +20,6 @@ a|* <<school-timetabling, School timetabling>>
 
 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)
-* link:technology/java-activemq-quarkus/README.adoc[ActiveMQ] (Java, ActiveMQ, Maven, Quarkus)
 * link:technology/kotlin-quarkus/README.adoc[Kotlin] (Kotlin, Maven, Quarkus, H2)
 
 2+a|* <<timefold-solver-examples, Timefold examples (desktop)>>
@@ -59,7 +58,6 @@ image::build/quickstarts-showcase/src/main/resources/META-INF/resources/screensh
 
 * link:use-cases/school-timetabling/README.adoc[Run quarkus-school-timetabling] (Java, Maven or Gradle, Quarkus, H2)
 * link:technology/java-spring-boot/README.adoc[Run spring-boot-school-timetabling] (Java, Maven or Gradle, Spring Boot, H2)
-* link:technology/java-activemq-quarkus/README.adoc[Run activemq-quarkus-school-timetabling] (Java, ActiveMQ, Maven, Quarkus)
 * link:technology/kotlin-quarkus/README.adoc[Run kotlin-quarkus-school-timetabling] (Kotlin, Maven, Quarkus, H2)
 * link:use-cases/vehicle-routing-capacity/README.adoc[Run quarkus-vehicle-routing-capacity] (Java, Maven or Gradle, Quarkus)
 

build/quickstarts-showcase/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>ai.timefold.solver</groupId>
     <artifactId>timefold-solver-quickstarts-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

hello-world/build.gradle

@@ -3,7 +3,7 @@ plugins {
     id "application"
 }
 
-def timefoldVersion = "1.0.0"
+def timefoldVersion = "1.1.0"
 def logbackVersion = "1.4.7"
 def junitJupiterVersion = "5.9.0"
 def assertjVersion = "3.24.2"

hello-world/pom.xml

@@ -12,14 +12,14 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jar.with.dependencies.name>hello-world-run</jar.with.dependencies.name>
 
-    <version.ai.timefold.solver>1.0.0</version.ai.timefold.solver>
+    <version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
     <version.org.assertj>3.24.2</version.org.assertj>
-    <version.org.junit.jupiter>5.9.0</version.org.junit.jupiter>
-    <version.org.logback>1.4.7</version.org.logback>
+    <version.org.junit.jupiter>5.10.0</version.org.junit.jupiter>
+    <version.org.logback>1.4.11</version.org.logback>
 
     <version.compiler.plugin>3.11.0</version.compiler.plugin>
-    <version.surefire.plugin>3.1.0</version.surefire.plugin>
-    <version.assembly.plugin>3.5.0</version.assembly.plugin>
+    <version.surefire.plugin>3.1.2</version.surefire.plugin>
+    <version.assembly.plugin>3.6.0</version.assembly.plugin>
   </properties>
 
   <dependencyManagement>

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>ai.timefold.solver</groupId>
     <artifactId>timefold-solver-build-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath/>
   </parent>
   <!-- IMPORTANT: the individual quickstarts have no parent pom. -->
@@ -22,7 +22,6 @@
   <modules>
     <module>hello-world</module>
     <module>technology/java-spring-boot</module>
-    <module>technology/java-activemq-quarkus</module>
     <module>technology/kotlin-quarkus</module>
     <module>use-cases/school-timetabling</module>
     <module>use-cases/facility-location</module>