Merge pull request #17374 from jhipster/skip_ci-spring-boot_2.5.8

Update spring-boot version to 2.5.8 and other dependencies
jhipster · Jan 1, 2022 · a831485 · a831485
2 parents 0a2dc89 + a3ba3ab
commit a831485
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/generators/generator-constants.js b/generators/generator-constants.js
@@ -36,14 +36,14 @@ const JIB_VERSION = '3.1.4';
 // Libraries version
 const JHIPSTER_DEPENDENCIES_VERSION = '7.4.2-SNAPSHOT';
 // The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
-const SPRING_BOOT_VERSION = '2.5.7';
+const SPRING_BOOT_VERSION = '2.5.8';
 const LIQUIBASE_VERSION = '4.6.1';
 const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('.');
-const HIBERNATE_VERSION = '5.4.32.Final';
+const HIBERNATE_VERSION = '5.4.33';
 
 const JACOCO_VERSION = '0.8.7';
 const KAFKA_VERSION = '5.5.5';
-const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.1';
+const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.2';
 
 // Version of docker images
 const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';

diff --git a/generators/server/templates/gradle.properties.ejs b/generators/server/templates/gradle.properties.ejs
@@ -33,7 +33,7 @@ archunitJunit5Version=0.22.0
 jacksonDatabindNullableVersion=<%= JACKSON_DATABIND_NULLABLE_VERSION %>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-caffeineVersion=3.0.4
+caffeineVersion=3.0.5
 typesafeConfigVersion=1.4.1
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
@@ -47,7 +47,7 @@ commonsBeanutilsVersion=1.9.4
 
 <%_ if (reactive) { _%>
 blockhoundJunitPlatformVersion=1.0.6.RELEASE
-junitPlatformLauncherVersion=1.8.1
+junitPlatformLauncherVersion=1.8.2
 <%_ } _%>
 
 <%_ if (databaseTypeSql) { _%>
@@ -61,23 +61,23 @@ cassandraDriverVersion=4.11.3
 
 # gradle plugin version
 jibPluginVersion=<%= JIB_VERSION %>
-gitPropertiesPluginVersion=2.3.1
+gitPropertiesPluginVersion=2.3.2
 <%_ if (!skipClient) { _%>
 gradleNodePluginVersion=3.1.1
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
-liquibasePluginVersion=2.1.0
+liquibasePluginVersion=2.1.1
 <%_ } _%>
 sonarqubePluginVersion=3.3
 <%_ if (enableSwaggerCodegen) { _%>
-openapiPluginVersion=5.2.1
+openapiPluginVersion=5.3.1
 <%_ } _%>
 noHttpCheckstyleVersion=0.0.10
-checkstyleVersion=9.1
+checkstyleVersion=9.2
 modernizerPluginVersion=1.6.1
 <%_ if (enableGradleEnterprise) { _%>
-gradleEnterprisePluginVersion=3.7.1
-gradleCommonCustomUserDataPluginVersion=1.5
+gradleEnterprisePluginVersion=3.8
+gradleCommonCustomUserDataPluginVersion=1.6.2
 <%_ } _%>
 # jhipster-needle-gradle-property - JHipster will add additional properties here
 

diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs
@@ -132,7 +132,7 @@
         <jackson-databind-nullable.version><%= JACKSON_DATABIND_NULLABLE_VERSION %></jackson-databind-nullable.version>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-        <caffeine.version>3.0.4</caffeine.version>
+        <caffeine.version>3.0.5</caffeine.version>
         <typesafe.version>1.4.1</typesafe.version>
 <%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
@@ -153,7 +153,7 @@
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <checkstyle.version>9.1</checkstyle.version>
+        <checkstyle.version>9.2</checkstyle.version>
         <nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
 <%_ if (!skipClient) { _%>
         <frontend-maven-plugin.version>1.12.0</frontend-maven-plugin.version>
@@ -168,7 +168,7 @@
         <jib-maven-plugin.architecture>amd64</jib-maven-plugin.architecture>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
 <%_ if (enableSwaggerCodegen) { _%>
-        <openapi-generator-maven-plugin.version>5.2.1</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>5.3.1</openapi-generator-maven-plugin.version>
 <%_ } _%>
         <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
         <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>

diff --git a/...rver/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs b/...rver/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs
@@ -68,7 +68,7 @@ class AuthorizationHeaderUtilTest {
 
     @BeforeEach
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         SecurityContextHolder.setContext(securityContext);
 
         doReturn(restTemplateBuilder).when(restTemplateBuilder).additionalMessageConverters(any(HttpMessageConverter.class));

diff --git a/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs b/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs
@@ -86,7 +86,7 @@ class MailServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
 
     @BeforeEach
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         doNothing().when(javaMailSender).send(any(MimeMessage.class));
         mailService = new MailService(jHipsterProperties, javaMailSender, messageSource, templateEngine);
     }

diff --git a/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs b/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs
@@ -41,7 +41,7 @@ class <%= controllerClass %>IT {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
 
         <%= controllerClass %> <%= controllerInstance %> = new <%= controllerClass %>();
         restMockMvc = MockMvcBuilders