generator-jhipster 7.6.0 → 7.8.1

package/generators/server/templates/couchbase/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs

@@ -19,44 +19,32 @@
 package <%= packageName %>.repository;
 
 import com.couchbase.client.java.query.QueryScanConsistency;
-import org.springframework.data.couchbase.repository.<% if (reactive) { %>Reactive<% } %>CouchbaseRepository;
-import org.springframework.data.couchbase.repository.ScanConsistency;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
+import org.springframework.data.couchbase.repository.*;
+import org.springframework.data.domain.*;
 import org.springframework.data.repository.NoRepositoryBean;
-<%_ if (searchEngineCouchbase) { _%>
-import com.couchbase.client.java.search.SearchQuery;
-import com.couchbase.client.java.search.queries.DocIdQuery;
-import com.couchbase.client.java.search.queries.QueryStringQuery;
-import java.util.LinkedList;
-<%_ } _%>
 
 <%_ if (reactive) { _%>
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 <%_ } else { _%>
-import org.springframework.data.domain.Page;
-<%_ } _%>
-
 import java.util.List;
+<%_ } _%>
 import java.util.stream.Collectors;
-import org.springframework.data.couchbase.core.query.Query;
 
 import static java.lang.String.format;
 
 /**
- * Couchbase specific {@link org.springframework.data.repository.Repository} interface uses N1QL for all requests.
+ * Couchbase specific {@link org.springframework.data.repository.Repository} interface that use KV first approach to optimize requests.
  */
 <%_
     let listOrFlux = reactive ? 'Flux' : 'List';
     let pageOrFlux = reactive ? 'Flux' : 'Page';
 _%>
 @NoRepositoryBean
+@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
 public interface JHipsterCouchbaseRepository<T, ID> extends <% if (reactive) { %>Reactive<% } %>CouchbaseRepository<T, ID> {
 
-    static String pageableStatement(Pageable pageable) {
-        return pageableStatement(pageable, "");
-    }
+    String FIND_IDS_QUERY = "SELECT meta().id as __id, 0 as __cas FROM #{#n1ql.bucket} WHERE #{#n1ql.filter}";
 
     static String pageableStatement(Pageable pageable, String prefix) {
         Sort sort = Sort.by(
@@ -72,43 +60,57 @@ public interface JHipsterCouchbaseRepository<T, ID> extends <% if (reactive) { %
                     return order.withProperty(format("%s.%s", prefix, property));
                 })
                 .collect(Collectors.toList()));
-        return new Query()
+        return new org.springframework.data.couchbase.core.query.Query()
             .limit(pageable.getPageSize())
             .skip(pageable.getOffset())
             .with(sort)
             .export();
     }
 
-<%_ if (searchEngineCouchbase) { _%>
-    static SearchQuery searchQuery(String queryString) {
-        List<String> ids = new LinkedList<>();
-        for (String r : queryString.split(" ")) {
-            if (r.indexOf("id:") == 0) {
-                ids.add(r.substring(3));
-                queryString = queryString.replace(r, "").replaceAll("[ ]+", " ").trim();
-            }
-        }
-        QueryStringQuery query = SearchQuery.queryString(queryString);
-        if (ids.size() != 0) {
-            DocIdQuery docIdQuery = SearchQuery.docId(ids.toArray(new String[0]));
-            if (!queryString.isEmpty()) {
-                return SearchQuery.conjuncts(query, docIdQuery);
-            }
-            return docIdQuery;
-        }
-        return query;
+    default <%= listOrFlux %><T> findAll() {
+        return findAllById(toIds(findAllIds()));
+    }
+
+    default <%= pageOrFlux %><T> findAll<% if (reactive) { %>By<% } %>(Pageable pageable) {
+<%_ if (reactive) { _%>
+        return findAllById(toIds(findAllIds(pageable)));
+<%_ } else { _%>
+        Page<T> page = findAllIds(pageable);
+        return new PageImpl<>(findAllById(toIds(page.getContent())), pageable, page.getTotalElements());
+<%_ } _%>
+    }
+
+    default <%= listOrFlux %><T> findAll(Sort sort) {
+        return findAllById(toIds(findAllIds(sort)));
     }
+
+    default <% if (reactive) { %>Mono<Void><% } else { %>void<% } %> deleteAll() {
+<%_ if (reactive) { _%>
+        return toIds(findAllIds())
+            .collectList()
+            .flatMap(this::deleteAllById);
+<%_ } else { _%>
+        deleteAllById(toIds(findAllIds()));
 <%_ } _%>
+    }
 
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><T> findAll();
+    @Query(FIND_IDS_QUERY)
+    <%= listOrFlux %><T> findAllIds();
 
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><T> findAll(Sort sort);
+    @Query(FIND_IDS_QUERY)
+    <%= pageOrFlux %><T> findAllIds(Pageable pageable);
 
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= pageOrFlux %><T> findAll<% if (reactive) { %>By<% } %>(Pageable pageable);
+    @Query(FIND_IDS_QUERY)
+    <%= listOrFlux %><T> findAllIds(Sort sort);
 
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <% if (reactive) { %>Mono<Void><% } else { %>void<% } %> deleteAll();
+    @SuppressWarnings("unchecked")
+    default <%= listOrFlux %><ID> toIds(<%= listOrFlux %><T> entities) {
+<%_ if (reactive) { _%>
+        return entities.mapNotNull(entity -> (ID) getEntityInformation().getId(entity));
+<%_ } else { _%>
+        return entities.stream()
+            .map(entity -> (ID) getEntityInformation().getId(entity))
+            .collect(Collectors.toList());
+<%_ } _%>
+    }
 }

package/generators/server/templates/couchbase/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs

@@ -31,11 +31,11 @@ import static <%= packageName %>.config.Constants.ID_DELIMITER;
 public interface PersistentTokenRepository extends CouchbaseRepository<PersistentToken, String> {
 
     default Optional<PersistentToken> findBySeries(String series) {
-        return findById(PersistentToken.PREFIX + ID_DELIMITER + series);
+        return findById(series);
     }
 
     default void deleteBySeries(String series) {
-        deleteById(PersistentToken.PREFIX + ID_DELIMITER + series);
+        deleteById(series);
     }
 
     default List<PersistentToken> findByUser(<%= asEntity('User') %> user) {

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_ADMIN.json.ejs

@@ -0,0 +1,3 @@
+{
+  "type": "authority"
+}

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_USER.json.ejs

@@ -0,0 +1,3 @@
+{
+  "type": "authority"
+}

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__admin.json.ejs → user/admin.json.ejs}

@@ -2,7 +2,7 @@
   "login": "admin",
 <%_ if (!authenticationTypeOauth2) { _%>
   "password": "$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC",
-<% } %>
+<%_ } _%>
   "firstName": "Administrator",
   "lastName": "Administrator",
   "email": "admin@localhost",
@@ -14,5 +14,5 @@
     "ROLE_USER",
     "ROLE_ADMIN"
   ],
-  "_class": "<%= packageName %>.domain.<%= asEntity('User') %>"
+  "type": "user"
 }

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__user.json.ejs → user/user.json.ejs}

@@ -2,7 +2,7 @@
   "login": "user",
 <%_ if (!authenticationTypeOauth2) { _%>
   "password": "$2a$10$VEjxo0jq2YG9Rbk2HmX9S.k1uZBGYUHdUcid3g/vfiEl7lwWgOH/K",
-<% } %>
+<%_ } _%>
   "firstName": "User",
   "lastName": "User",
   "email": "user@localhost",
@@ -13,5 +13,5 @@
   "authorities": [
     "ROLE_USER"
   ],
-  "_class": "<%= packageName %>.domain.<%= asEntity('User') %>"
+  "type": "user"
 }

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.2__create_indexes.n1ql.ejs

@@ -0,0 +1,34 @@
+CREATE INDEX user_mail ON `${bucket}`.`${scope}`.`user`(type, LOWER(email))
+    WHERE `type` = "user"
+    WITH { "defer_build" : true };
+
+CREATE INDEX user_activationKey ON `${bucket}`.`${scope}`.`user`(activationKey)
+    WHERE `type` = "user"
+    WITH { "defer_build" : true };
+
+CREATE INDEX user_resetKey ON `${bucket}`.`${scope}`.`user`(resetKey)
+    WHERE `type` = "user"
+    WITH { "defer_build" : true };
+
+CREATE INDEX user_activated ON `${bucket}`.`${scope}`.`user`(activated)
+    WHERE `type` = "user"
+      AND activated = true
+    WITH { "defer_build" : true };
+
+CREATE INDEX user_non_activated ON `${bucket}`.`${scope}`.`user`(createdDate)
+    WHERE `type` = "user"
+      AND activated = false
+      AND activationKey IS NOT NULL
+    WITH { "defer_build" : true };
+
+<%_ if (isUsingBuiltInAuthority()) { _%>
+CREATE INDEX authority_type ON `${bucket}`.`${scope}`.`authority`(type)
+    WHERE `type` = "authority"
+    WITH { "defer_build" : true };
+<%_ } _%>
+
+<%_ if (authenticationTypeSession) { _%>
+CREATE INDEX token_date ON `${bucket}`.`${scope}`.`persistentToken` %>(tokenDate)
+    WHERE `type` = "persistentToken"
+    WITH { "defer_build" : true };
+<%_ } _%>

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_collections.n1ql.ejs

@@ -0,0 +1,8 @@
+CREATE COLLECTION `${bucket}`.`${scope}`.`user`;
+
+<%_ if (isUsingBuiltInAuthority()) { _%>
+CREATE COLLECTION `${bucket}`.`${scope}`.`authority`;
+<%_ } _%>
+<%_ if (authenticationTypeSession) { _%>
+CREATE COLLECTION `${bucket}`.`${scope}`.`persistentToken`;
+<%_ } _%>

package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2020 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -20,8 +20,7 @@ package <%= packageName %>;
 
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.testcontainers.couchbase.BucketDefinition;
-import org.testcontainers.couchbase.CouchbaseContainer;
+import org.testcontainers.couchbase.*;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -43,12 +42,14 @@ public class CouchbaseTestContainerExtension implements BeforeAllCallback {
                 .asCompatibleSubstituteFor("couchbase/server");
             couchbase = new CouchbaseContainer(dockerImage)
                 .withBucket(new BucketDefinition(getBucketName()).withQuota(100))
+                .withServiceQuota(CouchbaseService.SEARCH, 1024)
                 .withCredentials("user", "secret");
             couchbase.start();
             System.setProperty("spring.couchbase.connection-string", couchbase.getConnectionString());
             System.setProperty("spring.couchbase.username", couchbase.getUsername());
             System.setProperty("spring.couchbase.password", couchbase.getPassword());
             System.setProperty("jhipster.database.couchbase.bucket-name", getBucketName());
+            System.setProperty("jhipster.database.couchbase.scope-name", "testScope");
             started.set(true);
         }
     }

package/generators/server/templates/couchbase/src/test/java/package/repository/{JHipsterCouchbaseRepositoryTest.java.ejs → CouchbaseSearchRepositoryTest.java.ejs}

@@ -27,12 +27,12 @@ import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class JHipsterCouchbaseRepositoryTest {
+class CouchbaseSearchRepositoryTest {
 
     @MethodSource
     @ParameterizedTest
     void queryString(String query, SearchQuery ftsQuery) {
-        assertThat(JHipsterCouchbaseRepository.searchQuery(query).toString()).isEqualTo(ftsQuery.toString());
+        assertThat(CouchbaseSearchRepository.searchQuery(query).toString()).isEqualTo(ftsQuery.toString());
     }
 
     @SuppressWarnings("unused")

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

@@ -0,0 +1,25 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/java/.devcontainer/base.Dockerfile
+
+# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster
+ARG VARIANT="11"
+FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
+
+# [Option] Install Maven
+ARG INSTALL_MAVEN="false"
+ARG MAVEN_VERSION=""
+# [Option] Install Gradle
+ARG INSTALL_GRADLE="false"
+ARG GRADLE_VERSION=""
+RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
+    && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
+
+# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
+ARG NODE_VERSION="none"
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

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/profile_prod.gradle.ejs

@@ -31,6 +31,10 @@ if (project.hasProperty("api-docs")) {
     profiles += ",api-docs"
 }
 
+if (project.hasProperty("e2e")) {
+    profiles += ",e2e"
+}
+
 springBoot {
     buildInfo()
 }

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

@@ -33,8 +33,8 @@ archunitJunit5Version=0.22.0
 jacksonDatabindNullableVersion=<%= JACKSON_DATABIND_NULLABLE_VERSION %>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-caffeineVersion=3.0.5
-typesafeConfigVersion=1.4.1
+caffeineVersion=3.0.6
+typesafeConfigVersion=1.4.2
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
 liquibaseHibernate5Version=<%= LIQUIBASE_VERSION %>
@@ -61,23 +61,23 @@ cassandraDriverVersion=4.13.0
 
 # gradle plugin version
 jibPluginVersion=<%= JIB_VERSION %>
-gitPropertiesPluginVersion=2.3.2
+gitPropertiesPluginVersion=2.4.0
 <%_ if (!skipClient) { _%>
-gradleNodePluginVersion=3.1.1
+gradleNodePluginVersion=3.2.1
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
 liquibasePluginVersion=2.1.1
 <%_ } _%>
 sonarqubePluginVersion=3.3
 <%_ if (enableSwaggerCodegen) { _%>
-openapiPluginVersion=5.3.1
+openapiPluginVersion=5.4.0
 <%_ } _%>
 noHttpCheckstyleVersion=0.0.10
-checkstyleVersion=9.2.1
+checkstyleVersion=10.1
 modernizerPluginVersion=1.6.2
 <%_ if (enableGradleEnterprise) { _%>
-gradleEnterprisePluginVersion=3.8.1
-gradleCommonCustomUserDataPluginVersion=1.6.2
+gradleEnterprisePluginVersion=3.9
+gradleCommonCustomUserDataPluginVersion=1.6.5
 <%_ } _%>
 # jhipster-needle-gradle-property - JHipster will add additional properties here
 

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%

package/generators/server/templates/npmw

@@ -10,22 +10,31 @@ if [ -f "$basedir/mvnw" ]; then
   PATH="$basedir/$builddir/:$PATH"
   NPM_EXE="$basedir/$builddir/node_modules/npm/bin/npm-cli.js"
   NODE_EXE="$basedir/$builddir/node"
-else
+elif [ -f "$basedir/gradlew" ]; then
   bindir="$basedir/build/node/bin"
   repodir="$basedir/build/node/lib/node_modules"
   installCommand="$basedir/gradlew npmSetup"
+else
+  echo "Using npm installed globally"
+  exec npm "$@"
 fi
 
-PATH="$bindir:$PATH"
 NPM_EXE="$repodir/npm/bin/npm-cli.js"
 NODE_EXE="$bindir/node"
 
-if ! [ -x "$NPM_EXE" ]; then
+if [ ! -x "$NPM_EXE" ] || [ ! -x "$NODE_EXE" ]; then
   $installCommand || true
 fi
 
-if ! [ -x "$NPM_EXE" ]; then
-  echo "Using npm installed globally"
+if [ -x "$NODE_EXE" ]; then
+  echo "Using node installed locally $($NODE_EXE --version)"
+  PATH="$bindir:$PATH"
+else
+  NODE_EXE='node'
+fi
+
+if [ ! -x "$NPM_EXE" ]; then
+  echo "Local npm not found, using npm installed globally"
   npm "$@"
 else
   echo "Using npm installed locally $($NODE_EXE $NPM_EXE --version)"