Merge pull request #5474 from pascalgrimaud/spring-boot-3.0.3

Bump to Spring boot 3.0.3
jhipster · Feb 24, 2023 · 88a0ae8 · 88a0ae8
2 parents c4e1777 + b6b7dcf
commit 88a0ae8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...h/jhipster/lite/generator/server/springboot/database/mysql/domain/MySQLModuleFactory.java b/...h/jhipster/lite/generator/server/springboot/database/mysql/domain/MySQLModuleFactory.java
@@ -13,6 +13,8 @@
 public class MySQLModuleFactory {
 
   private static final String MYSQL = "mysql";
+  private static final String MYSQL_GROUPID = "com.mysql";
+  private static final String MYSQL_ARTIFACTID = "mysql-connector-j";
 
   private final DockerImages dockerImages;
 
@@ -27,7 +29,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
 
     return sqlCommonModuleBuilder(properties, DatabaseType.MYSQL, dockerImages.get(MYSQL), documentationTitle("MySQL"), artifactId(MYSQL))
       .javaDependencies()
-      .addDependency(javaDependency().groupId(MYSQL).artifactId("mysql-connector-java").scope(JavaDependencyScope.RUNTIME).build())
+      .addDependency(javaDependency().groupId(MYSQL_GROUPID).artifactId(MYSQL_ARTIFACTID).scope(JavaDependencyScope.RUNTIME).build())
       .and()
       .springMainProperties()
       .set(propertyKey("spring.datasource.url"), propertyValue("jdbc:mysql://localhost:3306/" + properties.projectBaseName().name()))

diff --git a/src/main/resources/generator/dependencies/pom.xml b/src/main/resources/generator/dependencies/pom.xml
@@ -18,7 +18,7 @@
     <mockito.version>5.1.1</mockito.version>
     <jjwt.version>0.11.5</jjwt.version>
     <logstash-logback-encoder.version>7.3</logstash-logback-encoder.version>
-    <spring-boot.version>3.0.2</spring-boot.version>
+    <spring-boot.version>3.0.3</spring-boot.version>
     <spring-cloud.version>2022.0.0</spring-cloud.version>
     <spring-cloud-netflix-eureka-client.version>4.0.0</spring-cloud-netflix-eureka-client.version>
     <springdoc-openapi-starter-webmvc.version>2.0.2</springdoc-openapi-starter-webmvc.version>

diff --git a/...ipster/lite/generator/server/springboot/database/mysql/domain/MySQLModuleFactoryTest.java b/...ipster/lite/generator/server/springboot/database/mysql/domain/MySQLModuleFactoryTest.java
@@ -49,8 +49,8 @@ void shouldCreateModule() {
       .containing(
         """
               <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
                 <scope>runtime</scope>
               </dependency>
           """