npm - generator-jhipster - Versions diffs - 8.5.0 → 8.6.0 - Mend

generator-jhipster 8.5.0 → 8.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (211) hide show

package/dist/generators/server/resources/Dockerfile CHANGED Viewed

@@ -13,12 +13,12 @@ LABEL ALIAS=consul-config-loader
 FROM postgres:16.3
 LABEL ALIAS=postgresql
-FROM quay.io/keycloak/keycloak:24.0.4
+FROM quay.io/keycloak/keycloak:25.0.1
 LABEL ALIAS=keycloak
 FROM mysql:8.4.0
-FROM mariadb:11.3.2
+FROM mariadb:11.4.2
 FROM mongo:7.0.6
 LABEL ALIAS=mongodb
@@ -36,7 +36,7 @@ FROM neo4j:5.20.0
 FROM hazelcast/management-center:5.4.1
 LABEL ALIAS=hazelcast
-FROM memcached:1.6.27-alpine
+FROM memcached:1.6.28-alpine
 FROM redis:7.2.5
@@ -52,10 +52,10 @@ LABEL ALIAS=pulsar
 FROM sonarqube:10.5.1-community
 LABEL ALIAS=sonar
-FROM docker.io/bitnami/consul:1.18.2
+FROM docker.io/bitnami/consul:1.19.0
 LABEL ALIAS=consul
-FROM prom/prometheus:v2.52.0
+FROM prom/prometheus:v2.53.0
 LABEL ALIAS=prometheus
 FROM prom/alertmanager:v0.27.0

package/dist/generators/server/resources/gradle/libs.versions.toml CHANGED Viewed

@@ -9,9 +9,9 @@ feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', v
 testng = { module = 'org.testng:testng', version = '7.10.2' }
 cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.18.0' }
-mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.2' }
+mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.4' }
-neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.1' }
+neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.3' }
 # Cassandra
 lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' }
@@ -29,10 +29,10 @@ spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.25.0' }
 gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.2' }
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17.4' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17.5' }
-common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0.1' }
+common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0.2' }
-gatling-gradle = { id = 'io.gatling.gradle', version = '3.11.3' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.11.4' }
 gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.5.0' }

package/dist/generators/server/resources/pom.xml CHANGED Viewed

@@ -11,7 +11,7 @@
         <archunit-junit5.version>1.3.0</archunit-junit5.version>
         <blockhound-junit-platform.version>1.0.9.RELEASE</blockhound-junit-platform.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
-        <gatling.version>3.11.3</gatling.version>
+        <gatling.version>3.11.4</gatling.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <micrometer-context-propagation.version>1.1.1</micrometer-context-propagation.version>
@@ -21,28 +21,28 @@
         <checkstyle.version>10.17.0</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
         <frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
-        <gatling-maven-plugin.version>4.9.1</gatling-maven-plugin.version>
-        <git-commit-id-maven-plugin.version>8.0.2</git-commit-id-maven-plugin.version>
-        <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
+        <gatling-maven-plugin.version>4.9.4</gatling-maven-plugin.version>
+        <git-commit-id-maven-plugin.version>9.0.0</git-commit-id-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
-        <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
-        <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
+        <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
+        <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
-        <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
+        <maven-failsafe-plugin.version>3.3.0</maven-failsafe-plugin.version>
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+        <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
         <modernizer-maven-plugin.version>2.9.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
         <openapi-generator-maven-plugin.version>7.6.0</openapi-generator-maven-plugin.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
-        <sonar-maven-plugin.version>3.11.0.3922</sonar-maven-plugin.version>
+        <sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
         <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
     </properties>

package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs CHANGED Viewed

@@ -163,7 +163,7 @@ processResources {
     inputs.property('springProfiles', springProfiles)
     filesMatching("**/application.yml") {
         filter {
-            it.replace("#project.version#", version)
+            it.replace("@project.version@", version)
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {

package/dist/generators/server/templates/gradle/profile_prod.gradle.ejs CHANGED Viewed

@@ -98,7 +98,7 @@ processResources {
     inputs.property('springProfiles', springProfiles)
     filesMatching("**/application.yml") {
         filter {
-            it.replace("#project.version#", version)
+            it.replace("@project.version@", version)
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {

package/dist/generators/server/templates/pom.xml.ejs CHANGED Viewed

@@ -490,32 +490,6 @@
                         </rules>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>${maven-resources-plugin.version}</version>
-                    <executions>
-                        <execution>
-                            <id>config-resources</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                <resources>
-                                    <resource>
-                                        <directory><%= SERVER_MAIN_RES_DIR %></directory>
-                                        <filtering>true</filtering>
-                                        <includes>
-                                            <include>config/*.yml</include>
-                                        </includes>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>

package/dist/generators/server/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs CHANGED Viewed

@@ -40,7 +40,7 @@ import java.util.concurrent.Executor;
 @Profile("!testdev & !testprod")
 public class AsyncConfiguration implements AsyncConfigurer {
-    private final Logger log = LoggerFactory.getLogger(AsyncConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(AsyncConfiguration.class);
     private final TaskExecutionProperties taskExecutionProperties;

package/dist/generators/server/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs CHANGED Viewed

@@ -43,7 +43,7 @@ import org.springframework.security.oauth2.server.resource.web.DefaultBearerToke
 @Configuration
 public class SecurityJwtConfiguration {
-    private final Logger log = LoggerFactory.getLogger(SecurityJwtConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(SecurityJwtConfiguration.class);
     @Value("${jhipster.security.authentication.jwt.base64-secret}")
     private String jwtKey;

package/dist/generators/server/templates/src/main/java/_package_/config/WebConfigurer.java.ejs CHANGED Viewed

@@ -94,7 +94,7 @@ import java.util.concurrent.TimeUnit;
 @Configuration
 public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitializer<% if (!skipClient) { %>, WebServerFactoryCustomizer<WebServerFactory><% } %><% } %><% if (reactive) { %>WebFluxConfigurer<% } %> {
-    private final Logger log = LoggerFactory.getLogger(WebConfigurer.class);
+    private static final Logger log = LoggerFactory.getLogger(WebConfigurer.class);
 <%_ if (!reactive) { _%>
     private final Environment env;

package/dist/generators/server/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs CHANGED Viewed

@@ -51,7 +51,7 @@ import java.util.*;
 @Component("userDetailsService")
 public class DomainUserDetailsService implements <% if (reactive) { %>Reactive<% } %>UserDetailsService {
-    private final Logger log = LoggerFactory.getLogger(DomainUserDetailsService.class);
+    private static final Logger log = LoggerFactory.getLogger(DomainUserDetailsService.class);
     private final UserRepository userRepository;

package/dist/generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs CHANGED Viewed

@@ -81,7 +81,7 @@ import java.util.*;
 public class PersistentTokenRememberMeServices extends
     AbstractRememberMeServices {
-    private final Logger log = LoggerFactory.getLogger(PersistentTokenRememberMeServices.class);
+    private static final Logger log = LoggerFactory.getLogger(PersistentTokenRememberMeServices.class);
     // Token is valid for one month
     private static final int TOKEN_VALIDITY_DAYS = 31;

package/dist/generators/server/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs CHANGED Viewed

@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
 import java.util.List;
 public class AudienceValidator implements OAuth2TokenValidator<Jwt> {
-    private final Logger log = LoggerFactory.getLogger(AudienceValidator.class);
+    private static final Logger log = LoggerFactory.getLogger(AudienceValidator.class);
     private final OAuth2Error error = new OAuth2Error("invalid_token", "The required audience is missing", null);
     private final List<String> allowedAudience;

package/dist/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs CHANGED Viewed

@@ -56,7 +56,7 @@ _%>
 @Service
 public class MailService {
-    private final Logger log = LoggerFactory.getLogger(MailService.class);
+    private static final Logger log = LoggerFactory.getLogger(MailService.class);
     private static final String USER = "user";

package/dist/generators/server/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs CHANGED Viewed

@@ -104,6 +104,17 @@ public class <%= user.dtoClass %> implements Serializable {
             Objects.equals(getLogin(), userDTO.getLogin());
     }
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+            getId(),
+<%_ for (const { propertyJavaBeanName } of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
+          get<%= field.propertyJavaBeanName %>(),
+<%_ } _%>
+            getLogin()
+        );
+    }
     // prettier-ignore
     @Override
     public String toString() {

package/dist/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs CHANGED Viewed

@@ -74,7 +74,7 @@ public class AccountResource {
         }
     }
-    private final Logger log = LoggerFactory.getLogger(AccountResource.class);
+    private static final Logger log = LoggerFactory.getLogger(AccountResource.class);
     private final UserRepository userRepository;

package/dist/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs CHANGED Viewed

@@ -55,7 +55,7 @@ public class AccountResource {
         }
     }
-    private final Logger log = LoggerFactory.getLogger(AccountResource.class);
+    private static final Logger log = LoggerFactory.getLogger(AccountResource.class);
     private final UserService userService;

package/dist/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs CHANGED Viewed

@@ -68,7 +68,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/api")
 public class AccountResource {
-    private final Logger log = LoggerFactory.getLogger(AccountResource.class);
+    private static final Logger log = LoggerFactory.getLogger(AccountResource.class);
     private static class AccountResourceException extends RuntimeException {
 <%_ if (authenticationTypeOauth2 || authenticationTypeJwt) { _%>

package/dist/generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs CHANGED Viewed

@@ -61,7 +61,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 @RequestMapping("/api")
 public class AuthenticateController {
-    private final Logger log = LoggerFactory.getLogger(AuthenticateController.class);
+    private static final Logger log = LoggerFactory.getLogger(AuthenticateController.class);
     private final JwtEncoder jwtEncoder;

package/dist/generators/server/templates/src/main/resources/config/application-dev.yml.ejs CHANGED Viewed

@@ -111,7 +111,7 @@ spring:
         prefer-ip-address: true
         tags:
           - profile=${spring.profiles.active}
-          - version=#project.version#
+          - version='@project.version@'
           - git-version=${git.commit.id.describe:}
           - git-commit=${git.commit.id.abbrev:}
           - git-branch=${git.branch:}

package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs CHANGED Viewed

@@ -63,7 +63,7 @@ eureka:
     metadata-map:
       zone: primary # This is needed for the load balancer
       profile: ${spring.profiles.active}
-      version: #project.version#
+      version: '@project.version@'
       git-version: ${git.commit.id.describe:}
       git-commit: ${git.commit.id.abbrev:}
       git-branch: ${git.branch:}

package/dist/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs CHANGED Viewed

@@ -41,7 +41,7 @@ spring:
       discovery:
         tags:
           - profile=${spring.profiles.active}
-          - version=#project.version#
+          - version='@project.version@'
           - git-version=${git.commit.id.describe:}
           - git-commit=${git.commit.id.abbrev:}
           - git-branch=${git.branch:}

package/dist/generators/spring-boot/generator.js CHANGED Viewed

@@ -25,7 +25,7 @@ import { serverFiles } from './files.js';
 import cleanupTask from './cleanup.js';
 import { ADD_SPRING_MILESTONE_REPOSITORY } from '../generator-constants.js';
 import { addSpringFactory, getJavaValueGeneratorForType, getPrimaryKeyValue, getSpecificationBuildForType, insertContentIntoApplicationProperties, javaBeanCase, } from '../server/support/index.js';
-import { addJavaAnnotation, generateKeyStore } from '../java/support/index.js';
+import { generateKeyStore } from '../java/support/index.js';
 import { createNeedleCallback, mutateData } from '../base/support/index.js';
 import { APPLICATION_TYPE_MICROSERVICE, applicationTypes, cacheTypes, databaseTypes, fieldTypes, messageBrokerTypes, searchEngineTypes, testFrameworkTypes, websocketTypes, } from '../../jdl/index.js';
 import { writeFiles as writeEntityFiles } from './entity-files.js';
@@ -241,7 +241,9 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
                 };
             },
             addSpringIntegrationTest({ application, source }) {
-                source.addIntegrationTestAnnotation = ({ package: packageName, annotation }) => this.editFile(this.destinationPath(`${application.javaPackageTestDir}IntegrationTest.java`), content => addJavaAnnotation(content, { package: packageName, annotation }));
+                source.addIntegrationTestAnnotation = annotation => source.editJavaFile(this.destinationPath(`${application.javaPackageTestDir}IntegrationTest.java`), {
+                    annotations: [annotation],
+                });
             },
             addLogNeedles({ source }) {
                 source.addLogbackLogEntry = ({ file, name, level }) => this.editFile(this.destinationPath(file), createNeedleCallback({