generator-jhipster 7.1.0 → 7.4.0

package/generators/gradle/templates/.gitignore.jhi.gradle.ejs

@@ -0,0 +1,28 @@
+<%#
+ Copyright 2013-2021 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.
+
+ Licensed under the Apache License, Version 2.0 (the "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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+######################
+# Gradle
+######################
+.gradle/
+/build/
+
+######################
+# Gradle Wrapper
+######################
+!gradle/wrapper/gradle-wrapper.jar

package/generators/gradle/templates/.prettierignore.jhi.gradle.ejs

@@ -0,0 +1,22 @@
+<%#
+ Copyright 2013-2021 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.
+
+ Licensed under the Apache License, Version 2.0 (the "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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+# gradle
+build
+gradle
+.gradle

package/generators/gradle/templates/build.gradle.jhi.ejs

@@ -0,0 +1,48 @@
+<%#
+ Copyright 2013-2021 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.
+
+ Licensed under the Apache License, Version 2.0 (the "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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<&_
+  // Register sections and max allowed fragments, 0 for unlimited.
+  fragments.registerSections({
+    pluginsSection: 0,
+    repositoriesSection: 0,
+    dependenciesSection: 0,
+    testSection: 0,
+  });
+-&>
+plugins {
+  id 'java'
+<&- fragments.pluginsSection() -&>
+}
+
+group = '<%= packageName %>'
+version = '<%= JAVA_APP_VERSION %>'
+sourceCompatibility = '<%= JAVA_VERSION %>'
+
+repositories {
+  mavenCentral()
+<&- fragments.repositoriesSection() -&>
+}
+
+dependencies {
+<&- fragments.dependenciesSection() -&>
+}
+
+test {
+<&- fragments.testSection() -&>
+}

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

@@ -0,0 +1,57 @@
+<%#
+ Copyright 2013-2021 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.
+
+ Licensed under the Apache License, Version 2.0 (the "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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<&_
+  // Register sections and max allowed fragments, 0 for unlimited.
+  fragments.registerSections({
+    propertiesSection: 0,
+  });
+-&>
+rootProject.name=<%= dasherizedBaseName %>
+profile=dev
+
+<&- fragments.propertiesSection({join: '/n/n'}) -&>
+## below are some of the gradle performance improvement settings that can be used as required, these are not enabled by default
+
+## The Gradle daemon aims to improve the startup and execution time of Gradle.
+## The daemon is enabled by default in Gradle 3+ setting this to false will disable this.
+## https://docs.gradle.org/current/userguide/gradle_daemon.html#sec:ways_to_disable_gradle_daemon
+## uncomment the below line to disable the daemon
+
+#org.gradle.daemon=false
+
+## Specifies the JVM arguments used for the daemon process.
+## The setting is particularly useful for tweaking memory settings.
+## Default value: -Xmx1024m -XX:MaxPermSize=256m
+## uncomment the below line to override the daemon defaults
+
+#org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+## When configured, Gradle will run in incubating parallel mode.
+## This option should only be used with decoupled projects. More details, visit
+## http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+## uncomment the below line to enable parallel mode
+
+#org.gradle.parallel=true
+
+## Enables new incubating mode that makes Gradle selective when configuring projects.
+## Only relevant projects are configured which results in faster builds for large multi-projects.
+## http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand
+## uncomment the below line to enable the selective mode
+
+#org.gradle.configureondemand=true

package/generators/gradle/templates/settings.gradle.jhi.ejs

@@ -0,0 +1,20 @@
+<%#
+ Copyright 2013-2021 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.
+
+ Licensed under the Apache License, Version 2.0 (the "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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+
+rootProject.name = "<%= dasherizedBaseName %>"

package/generators/heroku/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;

package/generators/heroku/generator.spec.mjs

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2013-2021 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import testSupport from '../../test/support/index.cjs';
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+const { testBlueprintSupport } = testSupport;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+  describe('blueprint support', () => testBlueprintSupport(generator));
+});

package/generators/heroku/index.js

@@ -24,19 +24,24 @@ const ChildProcess = require('child_process');
 const util = require('util');
 const chalk = require('chalk');
 const glob = require('glob');
-
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const statistics = require('../statistics');
-
 const constants = require('../generator-constants');
-
+const cacheProviderOptions = require('../../jdl/jhipster/cache-types');
+const { MEMCACHED, REDIS } = require('../../jdl/jhipster/cache-types');
+const { OAUTH2 } = require('../../jdl/jhipster/authentication-types');
+const { GRADLE, MAVEN } = require('../../jdl/jhipster/build-tool-types');
+const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
+const { GENERATOR_HEROKU } = require('../generator-list');
+const { MARIADB, MYSQL, POSTGRESQL } = require('../../jdl/jhipster/database-types');
+const { EUREKA } = require('../../jdl/jhipster/service-discovery-types');
+
+const NO_CACHE_PROVIDER = cacheProviderOptions.NO;
 const execCmd = util.promisify(ChildProcess.exec);
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     this.option('skip-build', {
       desc: 'Skips building the application',
@@ -57,8 +62,12 @@ module.exports = class extends BaseBlueprintGenerator {
     this.randomPassword = crypto.randomBytes(20).toString('hex');
     this.herokuSkipBuild = this.options.skipBuild;
     this.herokuSkipDeploy = this.options.skipDeploy || this.options.skipBuild;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('heroku');
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_HEROKU);
+    }
   }
 
   _initializing() {
@@ -67,24 +76,19 @@ module.exports = class extends BaseBlueprintGenerator {
         this.checkInvocationFromCLI();
       },
 
+      loadCommonConfig() {
+        this.loadAppConfig();
+        this.loadServerConfig();
+        this.loadPlatformConfig();
+      },
+
       initializing() {
         this.log(chalk.bold('Heroku configuration is starting'));
         const configuration = this.config;
         this.env.options.appPath = configuration.get('appPath') || constants.CLIENT_MAIN_SRC_DIR;
-        this.baseName = configuration.get('baseName');
-        this.packageName = configuration.get('packageName');
-        this.packageFolder = configuration.get('packageFolder');
-        this.cacheProvider = configuration.get('cacheProvider') || 'no';
-        this.enableHibernateCache = configuration.get('enableHibernateCache') && !['no', 'memcached'].includes(this.cacheProvider);
-        this.databaseType = configuration.get('databaseType');
-        this.prodDatabaseType = configuration.get('prodDatabaseType');
-        this.searchEngine = configuration.get('searchEngine');
+        this.cacheProvider = this.cacheProvider || NO_CACHE_PROVIDER;
+        this.enableHibernateCache = this.enableHibernateCache && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
         this.frontendAppName = this.getFrontendAppName();
-        this.buildTool = configuration.get('buildTool');
-        this.applicationType = configuration.get('applicationType');
-        this.reactive = configuration.get('reactive') || false;
-        this.serviceDiscoveryType = configuration.get('serviceDiscoveryType');
-        this.authenticationType = configuration.get('authenticationType');
         this.herokuAppName = configuration.get('herokuAppName');
         this.dynoSize = 'Free';
         this.herokuDeployType = configuration.get('herokuDeployType');
@@ -97,7 +101,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -189,29 +193,8 @@ module.exports = class extends BaseBlueprintGenerator {
             type: 'list',
             name: 'herokuJavaVersion',
             message: 'Which Java version would you like to use to build and run your app ?',
-            choices: [
-              {
-                value: '1.8',
-                name: '1.8',
-              },
-              {
-                value: '11',
-                name: '11',
-              },
-              {
-                value: '12',
-                name: '12',
-              },
-              {
-                value: '13',
-                name: '13',
-              },
-              {
-                value: '14',
-                name: '14',
-              },
-            ],
-            default: 1,
+            choices: constants.JAVA_COMPATIBLE_VERSIONS.map(version => ({ value: version })),
+            default: constants.JAVA_VERSION,
           },
         ];
 
@@ -221,7 +204,7 @@ module.exports = class extends BaseBlueprintGenerator {
       },
       askForOkta() {
         if (this.abort) return null;
-        if (this.authenticationType !== 'oauth2') return null;
+        if (this.authenticationType !== OAUTH2) return null;
         if (this.useOkta) return null;
         const prompts = [
           {
@@ -242,6 +225,7 @@ module.exports = class extends BaseBlueprintGenerator {
             default: 1,
           },
           {
+            when: answers => answers.useOkta,
             type: 'input',
             name: 'oktaAdminLogin',
             message: 'Login (valid email) for the JHipster Admin user:',
@@ -252,27 +236,21 @@ module.exports = class extends BaseBlueprintGenerator {
               return true;
             },
           },
-          {
-            type: 'confirm',
-            name: 'oktaAdminPassword',
-            message: `${chalk.blue('Take note of this password!')} You will need it on your first login: ${chalk.blue(
-              this.randomPassword
-            )}`,
-            default: true,
-          },
         ];
 
         return this.prompt(prompts).then(props => {
           this.useOkta = props.useOkta;
-          this.oktaAdminLogin = props.oktaAdminLogin;
-          this.oktaAdminPassword = this.randomPassword;
+          if (this.useOkta) {
+            this.oktaAdminLogin = props.oktaAdminLogin;
+            this.oktaAdminPassword = this.randomPassword;
+          }
         });
       },
     };
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -298,21 +276,40 @@ module.exports = class extends BaseBlueprintGenerator {
           herokuJavaVersion: this.herokuJavaVersion,
           useOkta: this.useOkta,
           oktaAdminLogin: this.oktaAdminLogin,
-          oktaAdminPassword: this.oktaAdminPassword,
         });
       },
     };
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
+  // Public API method used by the getter and also by Blueprints
+  _loading() {
+    return {
+      loadSharedConfig() {
+        this.loadAppConfig();
+        this.loadDerivedAppConfig();
+        this.loadClientConfig();
+        this.loadDerivedClientConfig();
+        this.loadServerConfig();
+        this.loadTranslationConfig();
+        this.loadPlatformConfig();
+      },
+    };
+  }
+
+  get loading() {
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
+  }
+
   _default() {
     return {
       insight() {
-        statistics.sendSubGenEvent('generator', 'heroku');
+        statistics.sendSubGenEvent('generator', GENERATOR_HEROKU);
       },
 
       gitInit() {
@@ -369,7 +366,7 @@ module.exports = class extends BaseBlueprintGenerator {
         const regionParams = this.herokuRegion !== 'us' ? ` --region ${this.herokuRegion}` : '';
 
         this.log(chalk.bold('\nCreating Heroku application and setting up node environment'));
-        const child = ChildProcess.exec(`heroku create ${this.herokuAppName}${regionParams}`, (err, stdout, stderr) => {
+        const child = ChildProcess.exec(`heroku create ${this.herokuAppName}${regionParams}`, { timeout: 6000 }, (err, stdout, stderr) => {
           if (err) {
             if (stderr.includes('is already taken')) {
               const prompts = [
@@ -436,7 +433,11 @@ module.exports = class extends BaseBlueprintGenerator {
               });
             } else {
               this.abort = true;
-              this.log.error(err);
+              if (stderr.includes('Invalid credentials')) {
+                this.log.error("Error: Not authenticated. Run 'heroku login' to login to your heroku account and try again.");
+              } else {
+                this.log.error(err);
+              }
               done();
             }
           } else {
@@ -476,7 +477,7 @@ module.exports = class extends BaseBlueprintGenerator {
         };
 
         this.log(chalk.bold('\nProvisioning addons'));
-        if (this.searchEngine === 'elasticsearch') {
+        if (this.searchEngine === ELASTICSEARCH) {
           ChildProcess.exec(
             `heroku addons:create bonsai:sandbox --as BONSAI --app ${this.herokuAppName}`,
             addonCreateCallback.bind(this, 'Elasticsearch')
@@ -490,11 +491,11 @@ module.exports = class extends BaseBlueprintGenerator {
         }
 
         let dbAddOn;
-        if (this.prodDatabaseType === 'postgresql') {
+        if (this.prodDatabaseType === POSTGRESQL) {
           dbAddOn = 'heroku-postgresql --as DATABASE';
-        } else if (this.prodDatabaseType === 'mysql') {
+        } else if (this.prodDatabaseType === MYSQL) {
           dbAddOn = 'jawsdb:kitefin --as DATABASE';
-        } else if (this.prodDatabaseType === 'mariadb') {
+        } else if (this.prodDatabaseType === MARIADB) {
           dbAddOn = 'jawsdb-maria:kitefin --as DATABASE';
         }
 
@@ -508,9 +509,9 @@ module.exports = class extends BaseBlueprintGenerator {
         }
 
         let cacheAddOn;
-        if (this.cacheProvider === 'memcached') {
+        if (this.cacheProvider === MEMCACHED) {
           cacheAddOn = 'memcachier:dev --as MEMCACHIER';
-        } else if (this.cacheProvider === 'redis') {
+        } else if (this.cacheProvider === REDIS) {
           cacheAddOn = 'heroku-redis:hobby-dev --as REDIS';
         }
 
@@ -529,12 +530,13 @@ module.exports = class extends BaseBlueprintGenerator {
       configureJHipsterRegistry() {
         if (this.abort || this.herokuAppExists) return undefined;
 
-        if (this.serviceDiscoveryType === 'eureka') {
+        if (this.serviceDiscoveryType === EUREKA) {
           const prompts = [
             {
               type: 'input',
               name: 'herokuJHipsterRegistryApp',
               message: 'What is the name of your JHipster Registry Heroku application?',
+              default: 'jhipster-registry',
             },
             {
               type: 'input',
@@ -546,6 +548,7 @@ module.exports = class extends BaseBlueprintGenerator {
               type: 'input',
               name: 'herokuJHipsterRegistryPassword',
               message: 'What is your JHipster Registry password?',
+              default: 'password',
             },
           ];
 
@@ -570,7 +573,16 @@ module.exports = class extends BaseBlueprintGenerator {
         }
         return undefined;
       },
+    };
+  }
+
+  get default() {
+    if (this.delegateToBlueprint) return {};
+    return this._default();
+  }
 
+  _writing() {
+    return {
       copyHerokuFiles() {
         if (this.abort) return;
 
@@ -580,7 +592,7 @@ module.exports = class extends BaseBlueprintGenerator {
         this.template('application-heroku.yml.ejs', `${constants.SERVER_MAIN_RES_DIR}/config/application-heroku.yml`);
         this.template('Procfile.ejs', 'Procfile');
         this.template('system.properties.ejs', 'system.properties');
-        if (this.buildTool === 'gradle') {
+        if (this.buildTool === GRADLE) {
           this.template('heroku.gradle.ejs', 'gradle/heroku.gradle');
         }
         if (this.useOkta) {
@@ -595,14 +607,14 @@ module.exports = class extends BaseBlueprintGenerator {
 
       addHerokuBuildPlugin() {
         if (this.abort) return;
-        if (this.buildTool !== 'gradle') return;
+        if (this.buildTool !== GRADLE) return;
         this.addGradlePlugin('gradle.plugin.com.heroku.sdk', 'heroku-gradle', '1.0.4');
         this.applyFromGradleScript('gradle/heroku');
       },
 
       addHerokuMavenProfile() {
         if (this.abort) return;
-        if (this.buildTool === 'maven') {
+        if (this.buildTool === MAVEN) {
           this.render('pom-profile.xml.ejs', profile => {
             this.addMavenProfile('heroku', `            ${profile.toString().trim()}`);
           });
@@ -611,9 +623,9 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get default() {
-    if (useBlueprints) return;
-    return this._default();
+  get writing() {
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
   }
 
   _end() {
@@ -697,7 +709,7 @@ module.exports = class extends BaseBlueprintGenerator {
 
             let buildpack = 'heroku/java';
             let configVars = 'MAVEN_CUSTOM_OPTS="-Pprod,heroku -DskipTests" ';
-            if (this.buildTool === 'gradle') {
+            if (this.buildTool === GRADLE) {
               buildpack = 'heroku/gradle';
               configVars = 'GRADLE_TASK="stage -Pprod -PnodeInstall" ';
             }
@@ -746,7 +758,7 @@ module.exports = class extends BaseBlueprintGenerator {
                 this.log(chalk.yellow('After you have installed jq execute ./provision-okta-addon.sh manually.'));
               }
               if (curlAvailable && jqAvailable) {
-                this.log(chalk.green('Running ./provision-okta-addon.sh to create all required roles and users to use with jhipster.'));
+                this.log(chalk.green('Running ./provision-okta-addon.sh to create all required roles and users for JHipster.'));
                 try {
                   await execCmd('./provision-okta-addon.sh');
                   this.log(chalk.bold('\nOkta configured successfully!'));
@@ -766,7 +778,7 @@ module.exports = class extends BaseBlueprintGenerator {
         } else {
           this.log(chalk.bold('\nDeploying application'));
           let jarFileWildcard = 'target/*.jar';
-          if (this.buildTool === 'gradle') {
+          if (this.buildTool === GRADLE) {
             jarFileWildcard = 'build/libs/*.jar';
           }
 
@@ -817,7 +829,7 @@ module.exports = class extends BaseBlueprintGenerator {
                 this.log(chalk.yellow('After you have installed jq execute ./provision-okta-addon.sh manually.'));
               }
               if (curlAvailable && jqAvailable) {
-                this.log(chalk.green('Running ./provision-okta-addon.sh to create all required roles and users to use with JHipster.'));
+                this.log(chalk.green('Running ./provision-okta-addon.sh to create all required roles and users for JHipster.'));
                 try {
                   await execCmd('./provision-okta-addon.sh');
                   this.log(chalk.bold('\nOkta configured successfully!'));
@@ -840,7 +852,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/heroku/templates/Procfile.ejs

@@ -16,4 +16,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-web: java $JAVA_OPTS <% if (applicationType === 'gateway' || dynoSize === 'Free') { %>-Xmx256m<% } %> -jar <% if (buildTool === 'maven') { %>target<% } %><% if (buildTool === 'gradle') { %>build/libs<% } %>/*.jar --spring.profiles.active=prod,heroku <% if (prodDatabaseType === 'mongodb') { %>--spring.data.mongodb.database=$(echo "$MONGODB_URI" | sed "s/^.*:[0-9]*\///g")<% } %>
+web: java $JAVA_OPTS <% if (applicationTypeGateway || dynoSize === 'Free') { %>-Xmx256m<% } %> -jar <% if (buildToolMaven) { %>target<% } %><% if (buildToolGradle) { %>build/libs<% } %>/*.jar --spring.profiles.active=prod,heroku<% if (prodDatabaseTypeMongodb) { %> --spring.data.mongodb.database=$(echo "$MONGODB_URI" | sed "s/^.*:[0-9]*\///g")<% } %>