Merge pull request #2 from jhipster/master

Merge

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -1,7 +1,6 @@
 ---
 name: 💥 Report an issue
 about: Report a problem with JHipster itself.
-
 ---
 
 <!--

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -1,7 +1,6 @@
 ---
 name: 🚀 Feature Request
 about: Suggest an improvement.
-
 ---
 
 ##### **Overview of the feature request**

.github/ISSUE_TEMPLATE/SPONSOR_THE_PROJECT.md

@@ -1,7 +1,6 @@
 ---
 name: 🤝 Sponsor the project
 about: If you would like to support our efforts in maintaining this community-driven project!
-
 ---
 
 --------------^ Click "Preview" for a nicer view!

.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md

@@ -1,7 +1,6 @@
 ---
 name: 🤗 Support Question
 about: If you have a question, please use StackOverflow!
-
 ---
 
 --------------^ Click "Preview" for a nicer view!

.prettierignore

@@ -1,6 +1,7 @@
 node_modules
 travis
 docs
+.git
 .jhipster
 .vscode
 **/templates/**/

.travis.yml

@@ -18,100 +18,100 @@
 #
 
 os:
-  - linux
+    - linux
 services:
-  - docker
+    - docker
 language: node_js
 node_js:
-  - "10.15.0"
+    - '10.15.2'
 jdk:
-  - oraclejdk8
+    - openjdk11
 addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
+    apt:
+        sources:
+            - google-chrome
+        packages:
+            - google-chrome-stable
 cache:
-  directories:
-    - $HOME/.m2
-    - $HOME/.gradle
+    directories:
+        - $HOME/.m2
+        - $HOME/.gradle
 env:
-  global:
-    - JHI_PROFILE=dev
-    - JHI_RUN_APP=1
-    - JHI_PROTRACTOR=0
-    # if JHI_LIB_BRANCH value is release, use the release from Maven
-    - JHI_LIB_REPO=https://github.com/jhipster/jhipster.git
-    - JHI_LIB_BRANCH=release
-    # if JHI_GEN_BRANCH value is release, use the release from NPM
-    - JHI_GEN_REPO=https://github.com/jhipster/generator-jhipster.git
-    - JHI_GEN_BRANCH=release
-    # specific config
-    - SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
-    - SPRING_JPA_SHOW_SQL=false
-    - JHI_DISABLE_WEBPACK_LOGS=true
-    - JHI_E2E_HEADLESS=true
-    - JHI_SCRIPTS=$TRAVIS_BUILD_DIR/test-integration/scripts
-  matrix:
-    - JHI_APP=jdl-default JHI_ENTITY=jdl JHI_PROFILE=prod JHI_PROTRACTOR=1
-    - JHI_APP=ngx-default JHI_PROFILE=prod JHI_PROTRACTOR=1 JHI_ENTITY=sql JHI_SONAR=1
-    - JHI_APP=ngx-psql-es-noi18n JHI_PROFILE=prod JHI_PROTRACTOR=1 JHI_ENTITY=sqlfull
-    - JHI_APP=ngx-gradle-fr JHI_PROFILE=prod JHI_PROTRACTOR=1 JHI_ENTITY=sql
-    - JHI_APP=ngx-mariadb-oauth2-sass-infinispan JHI_PROTRACTOR=1 JHI_ENTITY=sql
-    - JHI_APP=ms-ngx-gateway-eureka JHI_ENTITY=sql
-    - JHI_APP=ms-micro-eureka JHI_ENTITY=micro
-    - JHI_APP=ngx-mongodb-kafka-cucumber JHI_ENTITY=mongodb
+    global:
+        - JHI_PROFILE=dev
+        - JHI_RUN_APP=1
+        - JHI_PROTRACTOR=0
+        # if JHI_LIB_BRANCH value is release, use the release from Maven
+        - JHI_LIB_REPO=https://github.com/jhipster/jhipster.git
+        - JHI_LIB_BRANCH=master
+        # if JHI_GEN_BRANCH value is release, use the release from NPM
+        - JHI_GEN_REPO=https://github.com/jhipster/generator-jhipster.git
+        - JHI_GEN_BRANCH=master
+        # specific config
+        - SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
+        - SPRING_JPA_SHOW_SQL=false
+        - JHI_DISABLE_WEBPACK_LOGS=true
+        - JHI_E2E_HEADLESS=true
+        - JHI_SCRIPTS=$TRAVIS_BUILD_DIR/test-integration/scripts
+    matrix:
+        - JHI_APP=jdl-default JHI_ENTITY=jdl JHI_PROFILE=prod JHI_PROTRACTOR=1
+        - JHI_APP=ngx-default JHI_PROFILE=prod JHI_PROTRACTOR=1 JHI_ENTITY=sql JHI_SONAR=1
+        - JHI_APP=ngx-psql-es-noi18n JHI_PROFILE=prod JHI_PROTRACTOR=1 JHI_ENTITY=sqlfull
+        - JHI_APP=ngx-gradle-fr JHI_PROFILE=prod JHI_PROTRACTOR=1 JHI_ENTITY=sql JHI_WAR=1
+        - JHI_APP=ngx-mariadb-oauth2-sass-infinispan JHI_PROTRACTOR=1 JHI_ENTITY=sql
+        - JHI_APP=ms-ngx-gateway-eureka JHI_ENTITY=sql JHI_WAR=1
+        - JHI_APP=ms-micro-eureka JHI_ENTITY=micro JHI_WAR=1
+        - JHI_APP=ngx-mongodb-kafka-cucumber JHI_ENTITY=mongodb
 
 #----------------------------------------------------------------------
 # Install all tools and check configuration
 #----------------------------------------------------------------------
 before_install:
-  - jdk_switcher use oraclejdk8
-  - java -version
-  - export TZ=Australia/Canberra
-  - date
-  - sudo /etc/init.d/mysql stop
-  - sudo /etc/init.d/postgresql stop
-  # Use this for Protractor
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  # Update NPM
-  - npm install -g npm
-  - $JHI_SCRIPTS/04-git-config.sh
+    - jdk_switcher use oraclejdk8
+    - java -version
+    - export TZ=Australia/Canberra
+    - date
+    - sudo /etc/init.d/mysql stop
+    - sudo /etc/init.d/postgresql stop
+    # Use this for Protractor
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
+    # Update NPM
+    - npm install -g npm
+    - $JHI_SCRIPTS/04-git-config.sh
 
 #----------------------------------------------------------------------
 # Install JHipster and generate project+entities
 #----------------------------------------------------------------------
 install:
-  - $JHI_SCRIPTS/10-install-jhipster.sh
-  - $JHI_SCRIPTS/11-generate-entities.sh
-  - $JHI_SCRIPTS/12-generate-project.sh
-  - $JHI_SCRIPTS/13-replace-version-generated-project.sh
-  - $JHI_SCRIPTS/14-jhipster-info.sh
+    - $JHI_SCRIPTS/10-install-jhipster.sh
+    - $JHI_SCRIPTS/11-generate-entities.sh
+    - $JHI_SCRIPTS/12-generate-project.sh
+    - $JHI_SCRIPTS/13-replace-version-generated-project.sh
+    - $JHI_SCRIPTS/14-jhipster-info.sh
 
 #----------------------------------------------------------------------
 # Launch tests
 #----------------------------------------------------------------------
 script:
-  - $JHI_SCRIPTS/20-docker-compose.sh
-  - $JHI_SCRIPTS/21-tests-backend.sh
-  - $JHI_SCRIPTS/22-tests-frontend.sh
-  - $JHI_SCRIPTS/23-package.sh
-  - $JHI_SCRIPTS/24-tests-e2e.sh
-  - $JHI_SCRIPTS/25-sonar-analyze.sh
+    - $JHI_SCRIPTS/20-docker-compose.sh
+    - $JHI_SCRIPTS/21-tests-backend.sh
+    - $JHI_SCRIPTS/22-tests-frontend.sh
+    - $JHI_SCRIPTS/23-package.sh
+    - $JHI_SCRIPTS/24-tests-e2e.sh
+    - $JHI_SCRIPTS/25-sonar-analyze.sh
 
 #----------------------------------------------------------------------
 # Cache
 #----------------------------------------------------------------------
 before_cache:
-  - rm -rf $HOME/.m2/repository/io/github/jhipster/jhipster-framework/
-  - rm -rf $HOME/.m2/repository/io/github/jhipster/jhipster-dependencies/
-  - rm -rf $HOME/.m2/repository/io/github/jhipster/jhipster-parent/
+    - rm -rf $HOME/.m2/repository/io/github/jhipster/jhipster-framework/
+    - rm -rf $HOME/.m2/repository/io/github/jhipster/jhipster-dependencies/
+    - rm -rf $HOME/.m2/repository/io/github/jhipster/jhipster-parent/
 notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/479b810ad42c816679fb
-    on_success: always  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
+    webhooks:
+        urls:
+            - https://webhooks.gitter.im/e/479b810ad42c816679fb
+        on_success: always # options: [always|never|change] default: always
+        on_failure: always # options: [always|never|change] default: always
+        on_start: false # default: false

CONTRIBUTING.md

@@ -27,7 +27,7 @@ If you find a bug in the source code or a mistake in the documentation, you can
 
 ## <a name="bounties"></a> Bug bounties
 
-If you submitted a Pull Request that fixes a ticket with the "$100" tag, then you are eligible to our bug bounty program! Go to our [bug bounties documentation](https://www.jhipster.tech/bug-bounties/) for more information, and claim your money.
+If you submitted a Pull Request that fixes a ticket with the "\$100" tag, then you are eligible to our bug bounty program! Go to our [bug bounties documentation](https://www.jhipster.tech/bug-bounties/) for more information, and claim your money.
 
 ## <a name="feature"></a> Feature Requests
 
@@ -272,7 +272,7 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
 -   Java files **must be** formatted using Intellij IDEA default code style.
 -   Generators JavaScript files **must follow** the eslint configuration defined at the project root, which is based on [Airbnb JavaScript Style Guide](https://github.com/airbnb/javascript).
 -   Any client side feature/change should be done for both Angular and react clients
--   Web apps JavaScript files **must follow** [Google's JavaScript Style Guide](https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml).
+-   Web apps JavaScript files **must follow** [Google's JavaScript Style Guide](https://google.github.io/styleguide/jsguide.html).
 -   Angular Typescript files **must follow** the [Official Angular style guide](https://angular.io/styleguide).
 -   React/Redux Typescript files **may follow** the [React/Redux Typescript guide](https://github.com/piotrwitek/react-redux-typescript-guide).
 

Dockerfile

@@ -23,7 +23,7 @@ RUN \
     libpng-dev \
     build-essential && \
   # install node.js
-  wget https://nodejs.org/dist/v10.15.0/node-v10.15.0-linux-x64.tar.gz -O /tmp/node.tar.gz && \
+  wget https://nodejs.org/dist/v10.15.2/node-v10.15.2-linux-x64.tar.gz -O /tmp/node.tar.gz && \
   tar -C /usr/local --strip-components 1 -xzf /tmp/node.tar.gz && \
   # upgrade npm
   npm install -g npm && \

README.md

@@ -1,6 +1,6 @@
 [![Logo][jhipster-image]][jhipster-url]
 
-[![NPM version][npm-image]][npm-url] [![Travis Build Status][travis-image]][travis-url-main] [![Azure DevOps Build Status][azure-devops-image]][azure-devops-url-main] [![Dependency Status][daviddm-image]][daviddm-url]
+[![NPM version][npm-image]][npm-url] [![Travis Build Status][travis-image]][travis-url-main] [![Azure DevOps Build Status][azure-devops-image]][azure-devops-url-main] [![Dependency Status][daviddm-image]][daviddm-url] [![Downloads][npmcharts-image]][npmcharts-url]
 
 Greetings, Java Hipster!
 
@@ -39,7 +39,7 @@ Support this project by becoming a sponsor! [Become a sponsor](https://opencolle
 Additional builds at [hipster-labs/jhipster-daily-builds](https://github.com/hipster-labs/jhipster-daily-builds)
 
 | Type                 | Status                                                 |
-|:---------------------|:-------------------------------------------------------|
+| :------------------- | :----------------------------------------------------- |
 | Docker               | [![Build Status][img-docker]][azure-url]               |
 | Angular.Maven        | [![Build Status][img-angular-maven]][azure-url]        |
 | Angular.Maven.NoSQL  | [![Build Status][img-angular-maven-nosql]][azure-url]  |
@@ -72,7 +72,6 @@ Additional builds at [hipster-labs/jhipster-daily-builds](https://github.com/hip
 [img-ms-jwt]: https://dev.azure.com/hipster-labs/jhipster-daily-builds/_apis/build/status/Microservices.JWT
 [img-ms-oauth2]: https://dev.azure.com/hipster-labs/jhipster-daily-builds/_apis/build/status/Microservices.OAuth2
 [img-ms-uaa]: https://dev.azure.com/hipster-labs/jhipster-daily-builds/_apis/build/status/Microservices.UAA
-
 [sonar-url]: https://sonarcloud.io/dashboard?id=io.github.jhipster.sample%3Ajhipster-sample-application
 [sonar-quality-gate]: https://sonarcloud.io/api/project_badges/measure?project=io.github.jhipster.sample%3Ajhipster-sample-application&metric=alert_status
 [sonar-coverage]: https://sonarcloud.io/api/project_badges/measure?project=io.github.jhipster.sample%3Ajhipster-sample-application&metric=coverage
@@ -104,3 +103,5 @@ Additional builds at [hipster-labs/jhipster-daily-builds](https://github.com/hip
 [talentplot-url]: https://talentplot.com/
 [issue-template]: https://github.com/jhipster/generator-jhipster/issues/new?template=BUG_REPORT.md
 [feature-template]: https://github.com/jhipster/generator-jhipster/issues/new?template=FEATURE_REQUEST.md
+[npmcharts-image]: https://img.shields.io/npm/dm/generator-jhipster.svg?label=Downloads&style=flat
+[npmcharts-url]: https://npmcharts.com/compare/generator-jhipster