generator-jhipster 7.3.0 → 7.5.0

package/generators/server/templates/gradle.properties.ejs

@@ -28,12 +28,12 @@ springBootVersion=<%= SPRING_BOOT_VERSION %>
 # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/<%= SPRING_BOOT_VERSION %> -->
 hibernateVersion=<%= HIBERNATE_VERSION %>
 mapstructVersion=1.4.2.Final
-archunitJunit5Version=0.21.0
+archunitJunit5Version=0.22.0
 <%_ if (enableSwaggerCodegen) { _%>
 jacksonDatabindNullableVersion=<%= JACKSON_DATABIND_NULLABLE_VERSION %>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-caffeineVersion=3.0.3
+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.7.2
+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.0
+gradleNodePluginVersion=3.1.1
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
-liquibasePluginVersion=2.0.4
+liquibasePluginVersion=2.1.1
 <%_ } _%>
 sonarqubePluginVersion=3.3
 <%_ if (enableSwaggerCodegen) { _%>
-openapiPluginVersion=5.2.1
+openapiPluginVersion=5.3.1
 <%_ } _%>
-noHttpCheckstyleVersion=0.0.9
-checkstyleVersion=9.0
-modernizerPluginVersion=1.6.0
+noHttpCheckstyleVersion=0.0.10
+checkstyleVersion=9.2
+modernizerPluginVersion=1.6.1
 <%_ if (enableGradleEnterprise) { _%>
-gradleEnterprisePluginVersion=3.6.4
-gradleCommonCustomUserDataPluginVersion=1.4.2
+gradleEnterprisePluginVersion=3.8
+gradleCommonCustomUserDataPluginVersion=1.6.2
 <%_ } _%>
 # jhipster-needle-gradle-property - JHipster will add additional properties here
 

package/generators/server/templates/npmw

@@ -4,14 +4,16 @@ basedir=`dirname "$0"`
 
 if [ -f "$basedir/mvnw" ]; then
   builddir="target/node"
-  installCommand="$basedir/mvnw frontend:install-node-and-npm@install-node-and-npm"
+  installCommand="$basedir/mvnw -Pwebapp frontend:install-node-and-npm@install-node-and-npm"
+  NPM_EXE="$basedir/$builddir/npm"
+  NODE_EXE=""
 else
-  builddir=".gradle/npm"
+  builddir="build/node"
   installCommand="$basedir/gradlew npmSetup"
+  NPM_EXE="$basedir/$builddir/lib/node_modules/npm/bin/npm-cli.js"
+  NODE_EXE="$basedir/$builddir/bin/node"
 fi
 
-NPM_EXE="$basedir/$builddir/npm"
-
 if ! [ -x "$NPM_EXE" ]; then
   $installCommand || true
 fi
@@ -20,6 +22,6 @@ if ! [ -x "$NPM_EXE" ]; then
   echo "Using npm installed globally"
   npm "$@"
 else
-  echo "Using npm installed locally $($NPM_EXE --version)"
-  $NPM_EXE "$@"
+  echo "Using npm installed locally $($NODE_EXE $NPM_EXE --version)"
+  $NODE_EXE $NPM_EXE "$@"
 fi

package/generators/server/templates/npmw.cmd

@@ -5,10 +5,12 @@
 set NPMW_DIR=%~dp0
 
 if exist "%NPMW_DIR%\mvnw.cmd" (
+  set NODE_EXE=""
   set NPM_EXE=%NPMW_DIR%\target\node\npm.cmd
-  set INSTALL_NPM_COMMAND=%NPMW_DIR%\mvnw.cmd frontend:install-node-and-npm@install-node-and-npm
+  set INSTALL_NPM_COMMAND=%NPMW_DIR%\mvnw.cmd -Pwebapp frontend:install-node-and-npm@install-node-and-npm
 ) else (
-  set NPM_EXE=%NPMW_DIR%\.gradle\npm\npm.cmd
+  set NODE_EXE=%NPMW_DIR%\build\node\bin\node.exe
+  set NPM_EXE=%NPMW_DIR%\build\node\lib\node_modules\npm\bin\npm-cli.js
   set INSTALL_NPM_COMMAND=%NPMW_DIR%\gradlew.bat npmSetup
 )
 
@@ -16,9 +18,12 @@ if not exist %NPM_EXE% (
   call %INSTALL_NPM_COMMAND%
 )
 
-if not exist %NPM_EXE% goto globalNpm
-
-%NPM_EXE% %*
-
-:globalNpm
-npm %*
+if exist %NODE_EXE% (
+  Rem Executing local npm with local node
+  call %NODE_EXE% %NPM_EXE% %*
+) else if exist %NPM_EXE% (
+  Rem Executing local npm
+  call %NPM_EXE% %*
+) else (
+  call npm %*
+)