generator-jhipster 7.7.0 → 7.9.0

package/generators/server/templates/devcontainer/devcontainer.json.ejs

@@ -0,0 +1,64 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/java
+{
+  "name": "<%= capitalizedBaseName %>",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "args": {
+      // Update the VARIANT arg to pick a Java version: 11, 17
+      // Append -bullseye or -buster to pin to an OS version.
+      // Use the -bullseye variants on local arm64/Apple Silicon.
+      "VARIANT": "11",
+      // Options
+      "INSTALL_MAVEN": "<%= buildToolMaven %>",
+      "INSTALL_GRADLE": "<%= buildToolGradle %>",
+      "NODE_VERSION": "lts/*"
+    }
+  },
+
+  // Set *default* container specific settings.json values on container create.
+  "settings": {
+    "java.home": "/docker-java-home"
+  },
+	
+  // Add the IDs of extensions you want installed when the container is created.
+  "extensions": [
+<%_ if(clientFrameworkAngular) { _%>
+    "angular.ng-template",
+<%_ } _%>
+<%_ if(!skipClient) { _%>
+    "christian-kohler.npm-intellisense",
+    "firsttris.vscode-jest-runner",
+    "ms-vscode.vscode-typescript-tslint-plugin",
+    "dbaeumer.vscode-eslint",
+<%_ } _%>
+    "vscjava.vscode-java-pack",
+    "pivotal.vscode-boot-dev-pack",
+    "esbenp.prettier-vscode"
+	],
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  "forwardPorts": [
+<%_ if(clientFrameworkAngular) { _%>
+    4200,
+<%_ } _%>
+<%_ if(clientFrameworkReact || clientFrameworkVue) { _%>
+    9060,
+<%_ } _%>
+<%_ if(!skipClient) { _%>
+    3001,
+    9000,
+<%_ } _%>
+    <%= serverPort %>
+  ],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "java -version",
+
+  // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "vscode",
+  "features": {
+    "docker-in-docker": "latest",
+    "docker-from-docker": "latest"
+  }
+}

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

@@ -19,6 +19,12 @@
 jib {
     from {
         image = "<%= DOCKER_JAVA_JRE %>"
+        platforms {
+            platform {
+                architecture = "${findProperty('jibArchitecture') ?: 'amd64'}"
+                os = "linux"
+            }
+        }
     }
     to {
         image = "<%= baseName.toLowerCase() %>:latest"

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

@@ -16,12 +16,76 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+<%_ if (devDatabaseType !== prodDatabaseType && (prodDatabaseTypeMariadb || prodDatabaseTypeMssql || prodDatabaseTypeMysql || prodDatabaseTypePostgres)) { _%>
+sourceSets {
+    test {
+        java {
+            exclude '<%= packageFolder %>/config/<% if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer.java'
+        }
+    }
+}
+<%_ } _%>
+<%_ if (databaseTypeSql) { _%>
 dependencies {
     developmentOnly "org.springframework.boot:spring-boot-devtools:${springBootVersion}"
-<%_ if (devDatabaseTypeH2Disk || devDatabaseTypeH2Memory) { _%>
+<%_ if (devDatabaseTypeH2Any) { _%>
+    <%_ if (reactive) { _%>
+    implementation "io.r2dbc:r2dbc-h2"
+    <%_ } else { _%>
     implementation "com.h2database:h2"
-<%_ } _%>
+    <%_ } _%>
+  <%_ } _%>
+  <%_ if (devDatabaseTypeMysql) { _%>
+    <%_ if (reactive) { _%>
+    implementation ("org.mariadb:r2dbc-mariadb")
+    <%_ } _%>
+    implementation "mysql:mysql-connector-java"
+    liquibaseRuntime "mysql:mysql-connector-java"
+  <%_ } _%>
+  <%_ if (devDatabaseTypePostgres) { _%>
+    <%_ if (reactive) { _%>
+    implementation "org.postgresql:r2dbc-postgresql"
+    <%_ } _%>
+    implementation "org.postgresql:postgresql"
+    liquibaseRuntime "org.postgresql:postgresql"
+  <%_ } _%>
+  <%_ if (devDatabaseTypeMariadb) { _%>
+    <%_ if (reactive) { _%>
+    implementation "org.mariadb:r2dbc-mariadb"
+    <%_ } _%>
+    implementation "org.mariadb.jdbc:mariadb-java-client"
+    liquibaseRuntime "org.mariadb.jdbc:mariadb-java-client"
+  <%_ } _%>
+  <%_ if (devDatabaseTypeMssql) { _%>
+    <%_ if (reactive) { _%>
+    implementation "io.r2dbc:r2dbc-mssql"
+    <%_ } _%>
+    implementation "com.microsoft.sqlserver:mssql-jdbc"
+    implementation "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
+    liquibaseRuntime "com.microsoft.sqlserver:mssql-jdbc"
+    liquibaseRuntime "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
+  <%_ } _%>
+  <%_ if (devDatabaseTypeOracle) { _%>
+    implementation "com.oracle.database.jdbc:ojdbc8"
+    liquibaseRuntime "com.oracle.database.jdbc:ojdbc8"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMysql) { _%>
+    testImplementation "org.testcontainers:mysql"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMariadb) { _%>
+    testImplementation "org.testcontainers:mariadb"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypePostgres) { _%>
+    testImplementation "org.testcontainers:postgresql"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMssql) { _%>
+    testImplementation "org.testcontainers:mssqlserver"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeOracle) { _%>
+    testImplementation "org.testcontainers:oracle-xe"
+  <%_ } _%>
 }
+<%_ } _%>
 
 def profiles = "dev"
 if (project.hasProperty("no-liquibase")) {
@@ -40,7 +104,7 @@ springBoot {
 }
 
 bootRun {
-    args = []
+    args = ["--spring.profiles.active=${profiles}"]
 <%_ if (cacheProviderInfinispan) { _%>
     jvmArgs = ["-Djgroups.tcp.address=NON_LOOPBACK", "-Djava.net.preferIPv4Stack=true"]
 <%_ } _%>
@@ -117,6 +181,34 @@ processResources {
 <%_ } _%>
 }
 
+task integrationTest(type: Test) {
+    maxHeapSize = "1G"
+    useJUnitPlatform()
+    description = "Execute integration tests."
+    group = "verification"
+    include "**/*IT*", "**/*IntTest*"
+<%_ if (cucumberTests) { _%>
+    exclude "**/*CucumberIT*"
+<%_ } _%>
+    testLogging {
+        events 'FAILED', 'SKIPPED'
+    }
+    systemProperty('spring.profiles.active', 'testdev')
+    systemProperty('java.security.egd', 'file:/dev/./urandom')
+    // uncomment if the tests reports are not generated
+    // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
+    // ignoreFailures true
+    reports.html.enabled = false
+<%_ if (reactive) { _%>
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
+        jvmArgs += [
+            "-XX:+AllowRedefinitionToAddDeleteMethods"
+        ]
+    }
+<%_ } _%>
+}
+integrationTest.dependsOn test
+
 <%_ if (!skipClient) { _%>
 processResources.dependsOn webapp
 bootJar.dependsOn processResources

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

@@ -16,11 +16,58 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-dependencies {
-<%_ if (databaseTypeSql) { _%>
-    testImplementation "com.h2database:h2"
+<%_ if (devDatabaseType !== prodDatabaseType && (devDatabaseTypeMariadb || devDatabaseTypeMssql || devDatabaseTypeMysql || devDatabaseTypePostgres)) { _%>
+sourceSets {
+    test {
+        java {
+            exclude '<%= packageFolder %>/config/<% if (devDatabaseTypeMariadb) { %>Mariadb<% } else if (devDatabaseTypeMssql) { %>MsSql<% } else if (devDatabaseTypeMysql) { %>Mysql<% } else if (devDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer.java'
+        }
+    }
+}
 <%_ } _%>
+<%_ if (databaseTypeSql) { _%>
+dependencies {
+  <%_ if (prodDatabaseTypeMysql) { _%>
+    <%_ if (reactive) { _%>
+    implementation ("org.mariadb:r2dbc-mariadb")
+    <%_ } _%>
+    implementation "mysql:mysql-connector-java"
+    liquibaseRuntime "mysql:mysql-connector-java"
+    testImplementation "org.testcontainers:mysql"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypePostgres) { _%>
+    <%_ if (reactive) { _%>
+    implementation "org.postgresql:r2dbc-postgresql"
+    <%_ } _%>
+    implementation "org.postgresql:postgresql"
+    liquibaseRuntime "org.postgresql:postgresql"
+    testImplementation "org.testcontainers:postgresql"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMariadb) { _%>
+    <%_ if (reactive) { _%>
+    implementation "org.mariadb:r2dbc-mariadb"
+    <%_ } _%>
+    implementation "org.mariadb.jdbc:mariadb-java-client"
+    liquibaseRuntime "org.mariadb.jdbc:mariadb-java-client"
+    testImplementation "org.testcontainers:mariadb"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMssql) { _%>
+    <%_ if (reactive) { _%>
+    implementation "io.r2dbc:r2dbc-mssql"
+    <%_ } _%>
+    implementation "com.microsoft.sqlserver:mssql-jdbc"
+    testImplementation "org.testcontainers:mssqlserver"
+    implementation "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
+    liquibaseRuntime "com.microsoft.sqlserver:mssql-jdbc"
+    liquibaseRuntime "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeOracle) { _%>
+    implementation "com.oracle.database.jdbc:ojdbc8"
+    liquibaseRuntime "com.oracle.database.jdbc:ojdbc8"
+    testImplementation "org.testcontainers:oracle-xe"
+  <%_ } _%>
 }
+<%_ } _%>
 
 def profiles = "prod"
 if (project.hasProperty("no-liquibase")) {
@@ -40,7 +87,7 @@ springBoot {
 }
 
 bootRun {
-    args = []
+    args = ["--spring.profiles.active=${profiles}"]
 <%_ if (cacheProviderInfinispan) { _%>
     jvmArgs = ["-Djgroups.tcp.address=NON_LOOPBACK", "-Djava.net.preferIPv4Stack=true"]
 <%_ } _%>
@@ -75,6 +122,35 @@ processResources {
 <%_ } _%>
 }
 
+task integrationTest(type: Test) {
+    maxHeapSize = "1G"
+    useJUnitPlatform()
+    description = "Execute integration tests."
+    group = "verification"
+    include "**/*IT*", "**/*IntTest*"
+<%_ if (cucumberTests) { _%>
+    exclude "**/*CucumberIT*"
+<%_ } _%>
+    testLogging {
+        events 'FAILED', 'SKIPPED'
+    }
+    systemProperty('spring.profiles.active', 'testprod')
+    systemProperty('java.security.egd', 'file:/dev/./urandom')
+    // uncomment if the tests reports are not generated
+    // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
+    // ignoreFailures true
+    reports.html.enabled = false
+<%_ if (reactive) { _%>
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
+        jvmArgs += [
+            "-XX:+AllowRedefinitionToAddDeleteMethods"
+        ]
+    }
+<%_ } _%>
+}
+integrationTest.dependsOn test
+
+
 <%_ if (!skipClient) { _%>
 processResources.dependsOn webapp
 bootJar.dependsOn processResources

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

@@ -27,13 +27,13 @@ springBootVersion=<%= SPRING_BOOT_VERSION %>
 # The hibernate version should match the one managed by
 # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/<%= SPRING_BOOT_VERSION %> -->
 hibernateVersion=<%= HIBERNATE_VERSION %>
-mapstructVersion=1.4.2.Final
+mapstructVersion=1.5.2.Final
 archunitJunit5Version=0.22.0
 <%_ if (enableSwaggerCodegen) { _%>
 jacksonDatabindNullableVersion=<%= JACKSON_DATABIND_NULLABLE_VERSION %>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-caffeineVersion=3.0.5
+caffeineVersion=3.1.1
 typesafeConfigVersion=1.4.2
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
@@ -47,38 +47,42 @@ commonsBeanutilsVersion=1.9.4
 
 <%_ if (reactive) { _%>
 blockhoundJunitPlatformVersion=1.0.6.RELEASE
-junitPlatformLauncherVersion=1.8.2
+junitPlatformLauncherVersion=1.9.0
 <%_ } _%>
 
 <%_ if (databaseTypeSql) { _%>
-jaxbRuntimeVersion=2.3.3
+jaxbRuntimeVersion=4.0.0
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
 # The cassandra driver version should match the one managed by
 # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/<%= SPRING_BOOT_VERSION %>
-cassandraDriverVersion=4.13.0
+cassandraDriverVersion=4.14.1
 <%_ } _%>
 
 # gradle plugin version
 jibPluginVersion=<%= JIB_VERSION %>
-gitPropertiesPluginVersion=2.4.0
+gitPropertiesPluginVersion=2.4.1
 <%_ if (!skipClient) { _%>
-gradleNodePluginVersion=3.2.1
+gradleNodePluginVersion=3.4.0
 <%_ } _%>
-<%_ if (databaseTypeSql && !reactive) { _%>
+<%_ if (databaseTypeSql) { _%>
 liquibasePluginVersion=2.1.1
 <%_ } _%>
-sonarqubePluginVersion=3.3
+sonarqubePluginVersion=3.4.0.2513
 <%_ if (enableSwaggerCodegen) { _%>
-openapiPluginVersion=5.4.0
+openapiPluginVersion=6.0.1
 <%_ } _%>
 noHttpCheckstyleVersion=0.0.10
-checkstyleVersion=9.3
+checkstyleVersion=10.3.1
 modernizerPluginVersion=1.6.2
 <%_ if (enableGradleEnterprise) { _%>
-gradleEnterprisePluginVersion=3.8.1
-gradleCommonCustomUserDataPluginVersion=1.6.3
+gradleEnterprisePluginVersion=3.10.3
+gradleCommonCustomUserDataPluginVersion=1.7.2
 <%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
+awaitilityVersion=4.2.0
+<%_ } _%>
+
 # jhipster-needle-gradle-property - JHipster will add additional properties here
 
 ## below are some of the gradle performance improvement settings that can be used as required, these are not enabled by default

package/generators/server/templates/mvnw

@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -36,6 +36,10 @@
 
 if [ -z "$MAVEN_SKIP_RC" ] ; then
 
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
   if [ -f /etc/mavenrc ] ; then
     . /etc/mavenrc
   fi
@@ -145,7 +149,7 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD="`which java`"
+    JAVACMD="`\\unset -f command; \\command -v java`"
   fi
 fi
 
@@ -212,9 +216,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@@ -233,9 +237,9 @@ else
           echo "Found wget ... using wget"
         fi
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
         else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
         fi
     elif command -v curl > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
@@ -305,6 +309,8 @@ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

package/generators/server/templates/mvnw.cmd

@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License.  You may obtain a copy of the License at
 @REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM    http://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an
@@ -46,8 +46,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
 :skipRcPre
 
 @setlocal
@@ -120,9 +120,9 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
 
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )
 
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...
@@ -158,7 +158,13 @@ if exist %WRAPPER_JAR% (
 @REM work with both Windows and non-Windows executions.
 set MAVEN_CMD_LINE_ARGS=%*
 
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end
 
@@ -168,15 +174,15 @@ set ERROR_CODE=1
 :end
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
 @REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
 :skipRcPost
 
 @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
 
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
 
-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%