Merge branch '428-add-mssql' of github.com:seraphinandrieux/jhipster-…

…lite into 428-add-mssql

.devcontainer/Dockerfile

@@ -0,0 +1,22 @@
+ARG VARIANT=17-bullseye
+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

.devcontainer/devcontainer.json

@@ -0,0 +1,20 @@
+{
+  "name": "Java",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "args": {
+      "VARIANT": "17-bullseye",
+      "INSTALL_MAVEN": "true",
+      "MAVEN_VERSION": "3.8.5",
+      "INSTALL_GRADLE": "false",
+      "NODE_VERSION": "lts/*"
+    }
+  },
+  "settings": {
+    "java.home": "/docker-java-home",
+    "maven.executable.path": "/usr/local/sdkman/candidates/maven/current/bin/mvn"
+  },
+  "extensions": ["vscjava.vscode-java-pack"],
+  "forwardPorts": [7471],
+  "remoteUser": "vscode"
+}

.github/actions/setup/action.yml

@@ -1,12 +1,12 @@
 name: 'Setup'
-description: 'Setup environment with Java 17, Node 16.14.0'
+description: 'Setup environment with Java 17, Node 16.15.0'
 runs:
   using: 'composite'
   steps:
     - name: 'Setup: Node.js'
       uses: actions/setup-node@v3
       with:
-        node-version: 16.14.0
+        node-version: 16.15.0
     - name: 'Setup: update NPM'
       shell: bash
       run: npm install -g npm

.github/dependabot.yml

@@ -4,6 +4,7 @@ updates:
     directory: '/'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 15
     rebase-strategy: 'disabled'
     labels:
@@ -13,6 +14,7 @@ updates:
     directory: '/src/main/resources/generator/dependencies/'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 20
     rebase-strategy: 'disabled'
     labels:
@@ -22,6 +24,7 @@ updates:
     directory: '/'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 10
     rebase-strategy: 'disabled'
     labels:
@@ -30,6 +33,7 @@ updates:
     directory: '/.github/actions/setup'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 10
     rebase-strategy: 'disabled'
     labels:
@@ -38,6 +42,7 @@ updates:
     directory: '/.github/workflows'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 10
     rebase-strategy: 'disabled'
     labels:
@@ -47,6 +52,7 @@ updates:
     directory: '/'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 10
     rebase-strategy: 'disabled'
     labels:
@@ -55,6 +61,7 @@ updates:
     directory: '/src/main/resources/generator/dependencies/common'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 20
     rebase-strategy: 'disabled'
     labels:
@@ -63,6 +70,7 @@ updates:
     directory: '/src/main/resources/generator/dependencies/vue'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 20
     rebase-strategy: 'disabled'
     labels:
@@ -71,6 +79,7 @@ updates:
     directory: '/src/main/resources/generator/dependencies/react'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 20
     rebase-strategy: 'disabled'
     labels:
@@ -79,13 +88,15 @@ updates:
     directory: '/src/main/resources/generator/dependencies/svelte'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 20
     labels:
       - 'area: dependencies'
   - package-ecosystem: 'npm'
     directory: '/src/main/resources/generator/dependencies/angular'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 20
     rebase-strategy: 'disabled'
     labels:
@@ -95,6 +106,7 @@ updates:
     directory: '/src/main/docker'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 20
     rebase-strategy: 'disabled'
     labels:
@@ -103,6 +115,7 @@ updates:
     directory: '/src/main/resources/generator/dependencies'
     schedule:
       interval: 'daily'
+      time: '00:00'
     open-pull-requests-limit: 20
     rebase-strategy: 'disabled'
     labels:

.github/workflows/github-actions.yml

@@ -69,7 +69,7 @@ jobs:
           ./mvnw clean verify sonar:sonar
       - name: 'Analysis: local Sonar'
         run: |
-          sleep 15
+          ./tests-ci/wait_sonar_analysis.sh
           ./tests-ci/sonar.sh
       - name: 'Analysis: SonarCloud'
         if: github.repository == 'jhipster/jhipster-lite' && github.ref == 'refs/heads/main'
@@ -78,19 +78,19 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: ./mvnw initialize sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.projectKey=jhipster_jhipster-lite -Dsonar.organization=jhipster
       - name: 'Artifact: upload JaCoCo report'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: jacoco
           path: '${{ github.workspace }}/target/jacoco/jacoco.xml'
           retention-days: 1
       - name: 'Artifact: upload lcov report'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: lcov
           path: '${{ github.workspace }}/target/test-results/lcov.info'
           retention-days: 1
       - name: 'Artifact: upload JAR'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: jhlite-jar
           path: '${{ github.workspace }}/target/*.jar'
@@ -139,6 +139,7 @@ jobs:
           - undertowapp
           - eurekaapp
           - consulapp
+          - gatewayapp
           - mongodbapp
           - gradleapp
           - angularapp
@@ -183,7 +184,7 @@ jobs:
         run: |
           if [ -f 'src/main/docker/sonar.yml' ]; then
             docker-compose -f src/main/docker/sonar.yml up -d
-            sleep 30
+            ${{ github.workspace }}/tests-ci/wait_sonar.sh
             docker ps -a
           fi
       - name: 'Test: verify ${{ matrix.app }}'
@@ -198,7 +199,7 @@ jobs:
       - name: 'Test: check local Sonar Analysis'
         run: |
           if [ -f '/tmp/jhlite/${{ matrix.app }}/src/main/docker/sonar.yml' ]; then
-            sleep 15
+            ${{ github.workspace }}/tests-ci/wait_sonar_analysis.sh
             ./tests-ci/sonar.sh ${{ matrix.app }}
           fi
   #--------------------------------------------------
@@ -258,7 +259,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v1.3.0
+        uses: dependabot/fetch-metadata@v1.3.1
       - name: Enable auto-merge for Dependabot PRs
         if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
         run: gh pr merge --auto --merge "$PR_URL"

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
           chmod +x mvnw
           ./mvnw clean verify
       - name: 'Artifact: upload JAR'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: jhlite-jar
           path: '${{ github.workspace }}/target/*.jar'

.gitignore

@@ -142,6 +142,7 @@ Desktop.ini
 ######################
 # Others
 ######################
+infinitest.filters
 *.class
 *.*~
 *~

.prettierignore

@@ -6,3 +6,5 @@ package-lock.json
 .mvn
 gradle
 .gradle
+!src/main/java/tech/jhipster/lite/generator/buildtool/gradle
+!src/test/java/tech/jhipster/lite/generator/buildtool/gradle

README.md

@@ -144,7 +144,9 @@ npm run e2e:headless
 
 ## Generate your project
 
-Go to http://localhost:7471/swagger-ui.html and build your own JSON to generate a project. Here an example:
+Go to http://localhost:7471, select your option and generate the code you want, step by step, and only what you need.
+
+If needed more advanced features, go to http://localhost:7471/swagger-ui.html and use your own JSON to generate the code you want. Here an example:
 
 <!-- prettier-ignore-start -->
 ```yaml
@@ -179,6 +181,7 @@ List of optional tools for Java:
 Setup:
 
 - GitHub Codespaces
+- Gitpod
 
 Spring Boot:
 

app.json

@@ -9,7 +9,7 @@
     },
     "JHIPSTER_LITE_VERSION": {
       "description": "Version of the JHipster Lite to deploy.",
-      "value": "0.0.16"
+      "value": "0.5.0"
     }
   },
   "buildpacks": [{ "url": "heroku/jvm" }, { "url": "https://github.com/jhipster/jhipster-lite-heroku-buildpack" }]

jest.config.js

@@ -16,7 +16,7 @@ module.exports = {
     '!src/main/webapp/app/router/index.ts',
     '!**/*.d.ts',
   ],
-  coverageReporters: ['html', 'json-summary', 'text-summary', 'lcov', 'clover'],
+  coverageReporters: ['html', 'json-summary', 'text', 'text-summary', 'lcov', 'clover'],
   coverageDirectory: '<rootDir>/target/test-results/',
   coverageThreshold: {
     global: {