fix: upgrade org.springframework.boot:spring-boot to 4.0.6, 3.5.14 (CVE-2026-40973)

command-query-responsibility-segregation/pom.xml

@@ -54,17 +54,12 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>5.6.15.Final</version>
+            <version>6.4.4.Final</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.3</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <version>4.0.5</version>
         </dependency>
     </dependencies>
     <build>

command-query-responsibility-segregation/src/main/java/com/iluwatar/cqrs/commandes/CommandServiceImpl.java

@@ -40,9 +40,9 @@ public class CommandServiceImpl implements CommandService {
   private Author getAuthorByUsername(String username) {
     Author author;
     try (var session = sessionFactory.openSession()) {
-      var query = session.createQuery("from Author where username=:username");
+      var query = session.createQuery("from Author where username=:username", Author.class);
       query.setParameter("username", username);
-      author = (Author) query.uniqueResult();
+      author = query.uniqueResult();
     }
     if (author == null) {
       HibernateUtil.getSessionFactory().close();
@@ -54,9 +54,9 @@ private Author getAuthorByUsername(String username) {
   private Book getBookByTitle(String title) {
     Book book;
     try (var session = sessionFactory.openSession()) {
-      var query = session.createQuery("from Book where title=:title");
+      var query = session.createQuery("from Book where title=:title", Book.class);
       query.setParameter("title", title);
-      book = (Book) query.uniqueResult();
+      book = query.uniqueResult();
     }
     if (book == null) {
       HibernateUtil.getSessionFactory().close();
@@ -70,7 +70,7 @@ public void authorCreated(String username, String name, String email) {
     var author = new Author(username, name, email);
     try (var session = sessionFactory.openSession()) {
       session.beginTransaction();
-      session.save(author);
+      session.persist(author);
       session.getTransaction().commit();
     }
   }
@@ -81,7 +81,7 @@ public void bookAddedToAuthor(String title, double price, String username) {
     var book = new Book(title, price, author);
     try (var session = sessionFactory.openSession()) {
       session.beginTransaction();
-      session.save(book);
+      session.persist(book);
       session.getTransaction().commit();
     }
   }
@@ -92,7 +92,7 @@ public void authorNameUpdated(String username, String name) {
     author.setName(name);
     try (var session = sessionFactory.openSession()) {
       session.beginTransaction();
-      session.update(author);
+      session.merge(author);
       session.getTransaction().commit();
     }
   }
@@ -103,7 +103,7 @@ public void authorUsernameUpdated(String oldUsername, String newUsername) {
     author.setUsername(newUsername);
     try (var session = sessionFactory.openSession()) {
       session.beginTransaction();
-      session.update(author);
+      session.merge(author);
       session.getTransaction().commit();
     }
   }
@@ -114,7 +114,7 @@ public void authorEmailUpdated(String username, String email) {
     author.setEmail(email);
     try (var session = sessionFactory.openSession()) {
       session.beginTransaction();
-      session.update(author);
+      session.merge(author);
       session.getTransaction().commit();
     }
   }
@@ -125,7 +125,7 @@ public void bookTitleUpdated(String oldTitle, String newTitle) {
     book.setTitle(newTitle);
     try (var session = sessionFactory.openSession()) {
       session.beginTransaction();
-      session.update(book);
+      session.merge(book);
       session.getTransaction().commit();
     }
   }
@@ -136,7 +136,7 @@ public void bookPriceUpdated(String title, double price) {
     book.setPrice(price);
     try (var session = sessionFactory.openSession()) {
       session.beginTransaction();
-      session.update(book);
+      session.merge(book);
       session.getTransaction().commit();
     }
   }

command-query-responsibility-segregation/src/main/java/com/iluwatar/cqrs/domain/model/Author.java

@@ -24,10 +24,11 @@
  */
 package com.iluwatar.cqrs.domain.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Column;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -41,7 +42,7 @@ public class Author {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   private long id;
-
+  @Column(unique = true)
   private String username;
   private String name;
   private String email;

command-query-responsibility-segregation/src/main/java/com/iluwatar/cqrs/domain/model/Book.java

@@ -24,11 +24,12 @@
  */
 package com.iluwatar.cqrs.domain.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.ManyToOne;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -45,7 +46,7 @@ public class Book {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   private long id;
-
+  @Column(unique = true)
   private String title;
   private double price;
   @ManyToOne private Author author;

command-query-responsibility-segregation/src/main/java/com/iluwatar/cqrs/queries/QueryServiceImpl.java

@@ -48,7 +48,8 @@ public Author getAuthorByUsername(String username) {
       Query<Author> sqlQuery =
           session.createQuery(
               "select new com.iluwatar.cqrs.dto.Author(a.name, a.email, a.username)"
-                  + " from com.iluwatar.cqrs.domain.model.Author a where a.username=:username");
+                  + " from com.iluwatar.cqrs.domain.model.Author a where a.username=:username",
+              Author.class);
       sqlQuery.setParameter(AppConstants.USER_NAME, username);
       authorDto = sqlQuery.uniqueResult();
     }
@@ -62,7 +63,8 @@ public Book getBook(String title) {
       Query<Book> sqlQuery =
           session.createQuery(
               "select new com.iluwatar.cqrs.dto.Book(b.title, b.price)"
-                  + " from com.iluwatar.cqrs.domain.model.Book b where b.title=:title");
+                  + " from com.iluwatar.cqrs.domain.model.Book b where b.title=:title",
+              Book.class);
       sqlQuery.setParameter("title", title);
       bookDto = sqlQuery.uniqueResult();
     }
@@ -77,7 +79,8 @@ public List<Book> getAuthorBooks(String username) {
           session.createQuery(
               "select new com.iluwatar.cqrs.dto.Book(b.title, b.price)"
                   + " from com.iluwatar.cqrs.domain.model.Author a, com.iluwatar.cqrs.domain.model.Book b "
-                  + "where b.author.id = a.id and a.username=:username");
+                  + "where b.author.id = a.id and a.username=:username",
+              Book.class);
       sqlQuery.setParameter(AppConstants.USER_NAME, username);
       bookDtos = sqlQuery.list();
     }
@@ -92,9 +95,10 @@ public BigInteger getAuthorBooksCount(String username) {
           session.createNativeQuery(
               "SELECT count(b.title)"
                   + " FROM  Book b, Author a"
-                  + " where b.author_id = a.id and a.username=:username");
+                  + " where b.author_id = a.id and a.username=:username",
+                  Long.class);
       sqlQuery.setParameter(AppConstants.USER_NAME, username);
-      bookcount = (BigInteger) sqlQuery.uniqueResult();
+      bookcount = BigInteger.valueOf(sqlQuery.uniqueResult());
     }
     return bookcount;
   }
@@ -103,8 +107,8 @@ public BigInteger getAuthorBooksCount(String username) {
   public BigInteger getAuthorsCount() {
     BigInteger authorcount;
     try (var session = sessionFactory.openSession()) {
-      var sqlQuery = session.createNativeQuery("SELECT count(id) from Author");
-      authorcount = (BigInteger) sqlQuery.uniqueResult();
+      var sqlQuery = session.createNativeQuery("SELECT count(id) from Author", Long.class);
+      authorcount = BigInteger.valueOf(sqlQuery.uniqueResult());
     }
     return authorcount;
   }

dao-factory/src/main/java/com/iluwatar/daofactory/H2CustomerDAO.java

@@ -33,7 +33,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

dao-factory/src/main/java/com/iluwatar/daofactory/H2DataSourceFactory.java

@@ -24,7 +24,7 @@
  */
 package com.iluwatar.daofactory;
 
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.h2.jdbcx.JdbcDataSource;
 
 /** H2DataSourceFactory concrete factory. */

dao-factory/src/test/java/com/iluwatar/daofactory/H2CustomerDAOTest.java

@@ -36,7 +36,7 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.List;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.h2.jdbcx.JdbcDataSource;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

data-access-object/src/main/java/com/iluwatar/dao/App.java

@@ -26,7 +26,7 @@
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import lombok.extern.slf4j.Slf4j;
 import org.h2.jdbcx.JdbcDataSource;
 

data-access-object/src/main/java/com/iluwatar/dao/DbCustomerDao.java

@@ -34,7 +34,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

data-access-object/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java

@@ -36,7 +36,7 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.h2.jdbcx.JdbcDataSource;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

dependency-injection/src/main/java/com/iluwatar/dependency/injection/GuiceWizard.java

@@ -24,7 +24,7 @@
  */
 package com.iluwatar.dependency.injection;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * GuiceWizard implements inversion of control. Its dependencies are injected through its

domain-model/src/main/java/com/iluwatar/domainmodel/App.java

@@ -28,7 +28,7 @@
 
 import java.sql.SQLException;
 import java.time.LocalDate;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.h2.jdbcx.JdbcDataSource;
 import org.joda.money.Money;
 

domain-model/src/main/java/com/iluwatar/domainmodel/CustomerDaoImpl.java

@@ -29,7 +29,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Optional;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.joda.money.Money;
 
 /** Implementations for database operations of Customer. */

domain-model/src/main/java/com/iluwatar/domainmodel/ProductDaoImpl.java

@@ -30,7 +30,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Optional;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.joda.money.Money;
 
 /** Implementations for database transactions of Product. */

domain-model/src/test/java/com/iluwatar/domainmodel/CustomerDaoImplTest.java

@@ -30,7 +30,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.LocalDate;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.junit.jupiter.api.AfterEach;

domain-model/src/test/java/com/iluwatar/domainmodel/ProductDaoImplTest.java

@@ -30,7 +30,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.LocalDate;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.joda.money.Money;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

domain-model/src/test/java/com/iluwatar/domainmodel/TestUtils.java

@@ -25,7 +25,7 @@
 package com.iluwatar.domainmodel;
 
 import java.sql.SQLException;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.h2.jdbcx.JdbcDataSource;
 
 public class TestUtils {

metadata-mapping/pom.xml

@@ -55,11 +55,6 @@
       <artifactId>hibernate-core</artifactId>
       <version>6.6.11.Final</version>
     </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.4.0-b180830.0359</version>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>

polling-publisher/polling-service/src/main/java/com/iluwatar/polling/DataRepository.java

@@ -27,7 +27,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.springframework.stereotype.Repository;
 
 /** Data repository to keep or store data. */

polling-publisher/pom.xml

@@ -83,11 +83,11 @@
             <version>${spring-boot.version}</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api -->
+        <!-- https://mvnrepository.com/artifact/jakarta.annotation/jakarta.annotation-api -->
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>3.0.0</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -39,7 +39,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Spring Boot related dependencies. Keep these in sync! -->
-    <spring-boot.version>3.4.5</spring-boot.version>
+    <spring-boot.version>3.5.14</spring-boot.version>
     <junit.version>5.11.4</junit.version>
     <mockito.version>5.14.2</mockito.version>
     <logback.version>1.5.18</logback.version>

repository/src/main/java/com/iluwatar/repository/AppConfig.java

@@ -26,7 +26,7 @@
 
 import java.util.List;
 import java.util.Properties;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.dbcp.BasicDataSource;
 import org.hibernate.jpa.HibernatePersistenceProvider;

repository/src/test/java/com/iluwatar/repository/AppConfigTest.java

@@ -28,7 +28,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.sql.SQLException;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;