Spring boot 4 and Lagchain4j 1.15.0 upgrade

Author: arey

.gitattributes

@@ -1,4 +1,5 @@
-mvnw            text eol=lf
+/mvnw           text eol=lf
+*.cmd           text eol=crlf
 *.java          text eol=lf
 
 /gradlew        text eol=lf

.gitignore

@@ -42,9 +42,6 @@ out/
 ### VS Code ###
 .vscode/
 
-### SDK Man ###
-.sdkmanrc
-
 ### CSS ###
 _site/
 **/.DS_Store

.mvn/wrapper/maven-wrapper.properties

@@ -1,19 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-wrapperVersion=3.3.2
+wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

README.md

@@ -63,16 +63,16 @@ Switching between LLM is done using **Maven profiles**. Three Maven profiles are
 2. `azure-openai`
 3. `ollama`
 
-By default, thanks to the default `openai` profile, the `langchain4j-open-ai-spring-boot-starter` dependency is enabled.
-You can change it to `langchain4j-azure-open-ai-spring-boot-starter` or `langchain4j-ollama-spring-boot-starter` by activating the corresponding profile.
+By default, thanks to the default `openai` profile, the `langchain4j-open-ai-spring-boot4-starter` dependency is enabled.
+You can change it to `langchain4j-azure-open-ai-spring-boot-starter` or `langchain4j-ollama-spring-boot4-starter` by activating the corresponding profile.
 ```shell
 ./mvnw package -P azure-openai
 ```
 `in either`pom.xml` or in `build.gradle`, depending on your build tool of choice.
 
 #### Gradle build
 
-Gradle users will need to comment or uncomment the appropriate `dev.langchain4j:langchain4j-<llm>>-spring-boot-starter` dependency
+Gradle users will need to comment or uncomment the appropriate `dev.langchain4j:langchain4j-<llm>>-spring-boot4-starter` dependency
 in the `build.gradle` file, depending on the LLM provider they want to use.
 
 
@@ -110,10 +110,17 @@ ollama run llama3.1
 ```
 By default, the Ollama REST API starts on `http://localhost:11434`. This URL is used in the `application.properties` file.
 
+See the presentation here:  
+[Spring Petclinic Sample Application (legacy slides)](https://speakerdeck.com/michaelisvy/spring-petclinic-sample-application?slide=20)
+
+> **Note:** These slides refer to a legacy, pre–Spring Boot version of Petclinic and may not reflect the current Spring Boot–based implementation.  
+> For up-to-date information, please refer to this repository and its documentation.
+
 
 ## Run Petclinic locally
 
-Spring Petclinic is a [Spring Boot](https://spring.io/guides/gs/spring-boot) application built using [Maven](https://spring.io/guides/gs/maven/) or [Gradle](https://spring.io/guides/gs/gradle/). You can build a jar file and run it from the command line (it should work just as well with Java 17 or newer):
+Spring Petclinic is a [Spring Boot](https://spring.io/guides/gs/spring-boot) application built using [Maven](https://spring.io/guides/gs/maven/) or [Gradle](https://spring.io/guides/gs/gradle/).
+Java 17 or later is required for the build, and the application can run with Java 17 or newer:
 
 ```bash
 git clone https://github.com/spring-petclinic/spring-petclinic-langchain4j.git
@@ -122,6 +129,8 @@ cd spring-petclinic
 java -jar target/*.jar
 ```
 
+(On Windows, or if your shell doesn't expand the glob, you might need to specify the JAR file name explicitly on the command line at the end there.)
+
 You can then access the Petclinic at <http://localhost:8080/>.
 
 ![Screenshot of the Find Owners menu](docs/find-owners-screenshot.png)
@@ -157,13 +166,13 @@ A similar setup is provided for MySQL and PostgreSQL if a persistent database co
 You can start MySQL or PostgreSQL locally with whatever installer works for your OS or use docker:
 
 ```bash
-docker run -e MYSQL_USER=petclinic -e MYSQL_PASSWORD=petclinic -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=petclinic -p 3306:3306 mysql:9.1
+docker run -e MYSQL_USER=petclinic -e MYSQL_PASSWORD=petclinic -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=petclinic -p 3306:3306 mysql:9.5
 ```
 
 or
 
 ```bash
-docker run -e POSTGRES_USER=petclinic -e POSTGRES_PASSWORD=petclinic -e POSTGRES_DB=petclinic -p 5432:5432 postgres:17.0
+docker run -e POSTGRES_USER=petclinic -e POSTGRES_PASSWORD=petclinic -e POSTGRES_DB=petclinic -p 5432:5432 postgres:18.1
 ```
 
 Further documentation is provided for [MySQL](https://github.com/spring-petclinic/spring-petclinic-langchain4j/blob/main/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt)
@@ -195,7 +204,7 @@ There is a `petclinic.css` in `src/main/resources/static/resources/css`. It was
 
 The following items should be installed in your system:
 
-- Java 17 or newer (full JDK, not a JRE)
+- Java 25 or newer (full JDK, not a JRE)
 - [Git command line tool](https://help.github.com/articles/set-up-git)
 - Your preferred IDE
   - Eclipse with the m2e plugin. Note: when m2e is available, there is an m2 icon in `Help -> About` dialog. If m2e is

build.gradle

@@ -1,10 +1,11 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.4.2'
-  id 'io.spring.dependency-management' version '1.1.6'
-//  id 'org.graalvm.buildtools.native' version '0.10.3'
-  id 'org.cyclonedx.bom' version '1.10.0'
-  id 'io.spring.javaformat' version '0.0.43'
+  id 'checkstyle'
+  id 'org.springframework.boot' version '4.0.6'
+  id 'io.spring.dependency-management' version '1.1.7'
+//  id 'org.graalvm.buildtools.native' version '0.11.1'
+  id 'org.cyclonedx.bom' version '3.0.2'
+  id 'io.spring.javaformat' version '0.0.47'
   id "io.spring.nohttp" version "0.0.11"
 }
 
@@ -15,24 +16,26 @@ apply plugin: 'io.spring.javaformat'
 // gradle.startParameter.excludedTaskNames += [ "checkFormatAot", "checkFormatAotTest" ]
 
 group = 'org.springframework.samples'
-version = '3.4.0'
+version = '4.0.6'
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_17
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(17)
+  }
 }
 
 repositories {
   mavenCentral()
   maven { url 'https://repo.spring.io/milestone' }
 }
 
-ext.checkstyleVersion = "10.20.1"
-ext.springJavaformatCheckstyleVersion = "0.0.43"
-ext.webjarsLocatorLiteVersion = "1.0.1"
+ext.checkstyleVersion = "12.1.2"
+ext.springJavaformatCheckstyleVersion = "0.0.47"
+ext.webjarsLocatorLiteVersion = "1.1.2"
 ext.webjarsFontawesomeVersion = "4.7.0"
-ext.webjarsBootstrapVersion = "5.3.3"
+ext.webjarsBootstrapVersion = "5.3.8"
 ext.webjarsMarkedVersion = "14.1.2"
-ext.langchain4jVersion = "1.9.1"
+ext.langchain4jVersion = "1.15.0"
 
 dependencyManagement {
   imports {
@@ -41,18 +44,18 @@ dependencyManagement {
 }
 
 dependencies {
-  implementation "dev.langchain4j:langchain4j-spring-boot-starter"
-  implementation "dev.langchain4j:langchain4j-open-ai-spring-boot-starter"
-//  implementation "dev.langchain4j:langchain4j-azure-open-ai-spring-boot-starter"
-//  implementation "dev.langchain4j:langchain4j-ollama-spring-boot-starter"
+  implementation "dev.langchain4j:langchain4j-spring-boot4-starter"
+  implementation "dev.langchain4j:langchain4j-open-ai-spring-boot4-starter"
+//  implementation "dev.langchain4j:langchain4j-azure-open-ai-spring-boot4-starter"
+//  implementation "dev.langchain4j:langchain4j-ollama-spring-boot4-starter"
   implementation "dev.langchain4j:langchain4j-embeddings-all-minilm-l6-v2"
   // Workaround for AOT issue (https://github.com/spring-projects/spring-framework/pull/33949) -->
   implementation 'io.projectreactor:reactor-core'
 
   implementation 'org.springframework.boot:spring-boot-starter-cache'
   implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
   implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-  implementation 'org.springframework.boot:spring-boot-starter-web'
+  implementation 'org.springframework.boot:spring-boot-starter-webmvc'
   implementation 'org.springframework.boot:spring-boot-starter-validation'
   implementation 'javax.cache:cache-api'
   implementation 'jakarta.xml.bind:jakarta.xml.bind-api'
@@ -66,12 +69,14 @@ dependencies {
   runtimeOnly 'com.mysql:mysql-connector-j'
   runtimeOnly 'org.postgresql:postgresql'
   developmentOnly 'org.springframework.boot:spring-boot-devtools'
-  testImplementation 'org.springframework.boot:spring-boot-starter-test'
+  testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa-test'
+  testImplementation 'org.springframework.boot:spring-boot-starter-restclient-test'
+  testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test'
   testImplementation 'org.springframework.boot:spring-boot-testcontainers'
   testImplementation 'org.springframework.boot:spring-boot-docker-compose'
-  testImplementation 'org.testcontainers:junit-jupiter'
-  testImplementation 'org.testcontainers:mysql'
-  testImplementation 'org.testcontainers:postgresql'
+  testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
+  testImplementation 'org.testcontainers:testcontainers-mysql'
+  testImplementation 'org.testcontainers:testcontainers-postgresql'
   checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${springJavaformatCheckstyleVersion}"
   checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
 }

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mysql:
-    image: mysql:9.1
+    image: mysql:9.5
     ports:
       - "3306:3306"
     environment:
@@ -12,7 +12,7 @@ services:
     volumes:
       - "./conf.d:/etc/mysql/conf.d:ro"
   postgres:
-    image: postgres:17.0
+    image: postgres:18.1
     ports:
       - "5432:5432"
     environment:

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME