drop jbcrypt from constants

jhipster · May 14, 2024 · 89acb31 · 89acb31
1 parent d90b933
commit 89acb31
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 19 deletions.
diff --git a/generators/constants.cjs b/generators/constants.cjs
@@ -51,7 +51,6 @@ module.exports = {
   },
   versions: {
     hibernate: '6.4.4.Final',
-    jbcrypt: '0.4',
     logback: '1.5.3',
     problem: '0.29.1',
     caffeine: '3.1.8',

diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js
@@ -203,7 +203,7 @@ export default class extends BaseApplicationGenerator {
             { groupId: 'net.logstash.logback', artifactId: 'logstash-logback-encoder', versionRef: 'logstash-logback-encoder' },
             { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', versionRef: 'jhipster-framework' },
             { groupId: 'org.apache.commons', artifactId: 'commons-lang3', versionRef: 'commons-lang3' },
-            { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', versionRef: 'swagger-annotations'},
+            { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', versionRef: 'swagger-annotations' },
             { groupId: 'org.mockito', artifactId: 'mockito-core', version: javaDependencies['mockito-core'], scope: 'test' },
           ],
         });
@@ -219,6 +219,13 @@ export default class extends BaseApplicationGenerator {
             addToBuild: true,
           });
         }
+
+        if (!application.skipUserManagement) {
+          source.addJavaDefinition({
+            versions: [{ name: 'jbcrypt', version: javaDependencies.jbcrypt }],
+            dependencies: [{ groupId: 'org.mindrot', artifactId: 'jbcrypt', versionRef: 'jbcrypt' }],
+          });
+        }
       },
       sqlDependencies({ application, source }) {
         if (application.databaseTypeSql) {

diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml
@@ -21,5 +21,7 @@ redisson = { module = 'org.redisson:redisson', version = '3.30.0' }
 
 swagger-annotations = { module = 'io.swagger.core.v3:swagger-annotations', version = '2.2.19' }
 
+jbcrypt = { module = 'org.mindrot:jbcrypt', version = '0.4' }
+
 [plugins]
 micronaut-application = { id = 'io.micronaut.application', version = '4.3.8' }
diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs
@@ -306,10 +306,6 @@ dependencies {
 <%_ } _%>
     implementation "io.micronaut.views:micronaut-views-thymeleaf"
 
-<%_ if (!skipUserManagement) { _%>
-    implementation "org.mindrot:jbcrypt:$jbcrypt_version"
-<%_ } _%>
-
     compileOnly "org.graalvm.nativeimage:svm"
 
     implementation "io.micronaut.validation:micronaut-validation"

diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs
@@ -33,9 +33,6 @@ hibernate_version=<%=versions.hibernate%>
 mapstruct_version=<%=javaDependencies.mapstruct%>
 archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %>
 logback_version=<%=versions.logback%>
-<%_ if (!skipUserManagement) { _%>
-jbcrypt_version=<%=versions.jbcrypt%>
-<%_ } _%>
 jakarta_inject_version=<%= versions.jakartaInject %>
 jakarta_mail_version=<%=versions.jakartaMail%>
 problem_version=<%=versions.problem%>

diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs
@@ -87,9 +87,6 @@ _%>
         <hibernate.version><%= versions.hibernate %></hibernate.version>
         <jakarta-inject.version><%= versions.jakartaInject %></jakarta-inject.version>
         <jakarta-mail.version><%= versions.jakartaMail %></jakarta-mail.version>
-        <%_ if (!skipUserManagement) { _%>
-        <jbcrypt.version><%= versions.jbcrypt %></jbcrypt.version>
-        <%_ } _%>
         <logback.version><%= versions.logback %></logback.version>
         <mapstruct.version><%- javaDependencies.mapstruct %></mapstruct.version>
         <problem.version><%= versions.problem %></problem.version>
@@ -382,13 +379,6 @@ _%>
             <scope>compile</scope>
         </dependency>
         <%_ } _%>
-        <%_ if (!skipUserManagement) { _%>
-        <dependency>
-            <groupId>org.mindrot</groupId>
-            <artifactId>jbcrypt</artifactId>
-            <version>${jbcrypt.version}</version>
-        </dependency>
-        <%_ } _%>
         <%_ if (applicationTypeMicroservice) { _%>
 
         <%_ } _%>