Merge branch 'main' into upgrade-jdlstudio

.eslintignore

@@ -2,7 +2,8 @@ node_modules/
 src/main/docker/
 src/main/resources/static/jdl-studio/
 src/test/javascript/protractor.conf.js
-src/test/javascript/jest.conf.js
+jest.conf.js
+coverage/
 webpack/
 target/
 build/

.eslintrc.json

@@ -1,16 +1,65 @@
 {
-  "plugins": ["@typescript-eslint/tslint"],
-  "extends": ["jhipster"],
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@angular-eslint/eslint-plugin", "@typescript-eslint"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/recommended-requiring-type-checking",
+    "plugin:@angular-eslint/recommended",
+    "prettier",
+    "eslint-config-prettier"
+  ],
+  "env": {
+    "browser": true,
+    "es6": true,
+    "commonjs": true
+  },
   "parserOptions": {
-    "project": "./tsconfig.json"
+    "ecmaVersion": 2018,
+    "sourceType": "module",
+    "project": ["./tsconfig.json"]
   },
   "rules": {
-    "@typescript-eslint/tslint/config": [
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/no-unsafe-assignment": "off",
+    "@typescript-eslint/no-unsafe-call": "off",
+    "@typescript-eslint/no-unsafe-return": "off",
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "@typescript-eslint/restrict-plus-operands": "off",
+    "@typescript-eslint/no-floating-promises": "off",
+    "@typescript-eslint/restrict-template-expressions": "off",
+    "@typescript-eslint/no-unsafe-argument": "off",
+    "no-shadow": "off",
+
+    "@typescript-eslint/member-ordering": [
       "error",
       {
-        "lintFile": "./tslint.json"
+        "default": ["static-field", "instance-field", "constructor", "static-method", "instance-method"]
       }
     ],
+    "@typescript-eslint/no-parameter-properties": ["warn", { "allows": ["public", "private", "protected"] }],
+    "@typescript-eslint/explicit-member-accessibility": "off",
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/ban-types": "off",
+    "@typescript-eslint/interface-name-prefix": "off",
+    "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/unbound-method": "off",
+    "spaced-comment": ["warn", "always"],
+    "guard-for-in": "error",
+    "no-labels": "error",
+    "no-caller": "error",
+    "no-bitwise": "error",
+    "no-console": ["error", { "allow": ["warn", "error"] }],
+    "no-new-wrappers": "error",
+    "no-eval": "error",
+    "no-new": "error",
+    "no-var": "error",
+    "radix": "error",
+    "eqeqeq": ["error", "always", { "null": "ignore" }],
+    "prefer-const": "error",
+    "object-shorthand": ["error", "always", { "avoidExplicitReturnArrows": true }],
     "@typescript-eslint/no-unused-vars": [
       "warn",
       {

.github/release-drafter.yml

@@ -1,3 +1,21 @@
+#
+# Copyright 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
+#
+# 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 "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.
+
 template: |
   ## What’s Changed
 

.github/workflows/copyright-update.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2017-2022 the original author or authors from the JHipster project.
+# Copyright 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,29 +20,38 @@ name: Copyright Update
 on:
   schedule:
     - cron: '0 0 31 12 *' # Repeats December 31st every year
+
+permissions:
+  contents: read
+
 jobs:
-  pipeline:
+  build:
+    permissions:
+      contents: write # for peter-evans/create-pull-request to create branch
+      pull-requests: write # for peter-evans/create-pull-request to create a PR
     name: copyright update
+    if: github.repository == 'jhipster/jhipster-online'
     runs-on: ubuntu-latest
     timeout-minutes: 40
-
     steps:
       # Checkout
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v3
+        with:
+          ref: main
+          fetch-depth: 0
       # Update the copyright headers
       - name: Find and Replace
         run: |
           CURRENT_YEAR=$(date +'%Y')
           NEW_YEAR=$(($CURRENT_YEAR + 1))
-          grep -rlZ "Copyright 2017-$CURRENT_YEAR" . | xargs -0 sed -i "s/Copyright 2017-$CURRENT_YEAR/Copyright 2017-$NEW_YEAR/g"
-
+          grep -rlZE "Copyright ([0-9]+)-$CURRENT_YEAR" . | xargs -0 sed -i -E "s/Copyright ([0-9]+)-$CURRENT_YEAR/Copyright \1-$NEW_YEAR/g"
       # Create PR
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
-          commit-message: 'feat: update copyright headers'
-          author: 'jhipster-bot <jhipster-bot@users.noreply.github.com>'
-          branch: 'copyright-header-update'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: 'Update copyright headers'
           title: 'Update Copyright Headers'
           body: 'This is an automated pull request to update the copyright headers'
+          branch: 'copyright-date-update'
+          author: 'jhipster-bot <jhipster-bot@users.noreply.github.com>'

.github/workflows/deploy.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2017-2022 the original author or authors from the JHipster project.
+# Copyright 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.
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       # Checkout with all submodules
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: 'true'
 
@@ -54,12 +54,16 @@ jobs:
           env_variables.GITLAB_CLIENT_SECRET: ${{ secrets.GITLAB_CLIENT_SECRET }}
           env_variables.GITLAB_REDIRECT_URI: ${{ secrets.GITLAB_REDIRECT_URI }}
 
-      # Setup gcloud CLI
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@main
+      # Setup Google Cloud
+      - name: Authenticate to Google Cloud
+        uses: 'google-github-actions/auth@v1'
         with:
-          version: '290.0.1'
-          service_account_key: ${{ secrets.GCP_SA_KEY }}
+          credentials_json: ${{ secrets.GCP_SA_KEY }}
+
+      - name: Set up Google Cloud SDK
+        uses: google-github-actions/setup-gcloud@v1
+        with:
+          version: '418.0.0'
           project_id: ${{ secrets.GCP_PROJECT_ID }}
 
       # Authenticate and push docker image to Artifact registry

.github/workflows/docker.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2013-2022 the original author or authors from the JHipster project.
+# Copyright 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.
@@ -29,31 +29,33 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1.10.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v3.5.0
+        uses: docker/metadata-action@v4
         with:
           images: ghcr.io/${{ github.repository }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/github-ci.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2017-2022 the original author or authors from the JHipster project.
+# Copyright 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.
@@ -25,21 +25,24 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.pull_request.title, '[skip ci]') && !contains(github.event.pull_request.title, '[ci skip]')"
     timeout-minutes: 40
     env:
-      NODE_VERSION: 14.17.6
+      NODE_VERSION: 16.19.0
       SPRING_OUTPUT_ANSI_ENABLED: DETECT
       SPRING_JPA_SHOW_SQL: false
       JHI_DISABLE_WEBPACK_LOGS: true
       NG_CLI_ANALYTICS: false
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14.17.6
+          node-version: 16.19.0
 
-      - uses: actions/setup-java@v1
+      - name: Set up Java
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: '11'
+          cache: 'maven'
 
       - name: Stop MySQL server
         run: sudo /etc/init.d/mysql stop

.github/workflows/release-drafter.yml

@@ -1,3 +1,21 @@
+#
+# Copyright 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
+#
+# 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 "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.
+
 name: Release Drafter
 
 on:

.gitignore

@@ -1,3 +1,4 @@
+/.angular/cache
 ######################
 # Project Specific
 ######################
@@ -130,6 +131,7 @@ Desktop.ini
 *.*~
 *~
 .merge_file*
+coverage/
 
 ######################
 # Gradle Wrapper

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

Dockerfile

@@ -1,4 +1,4 @@
-FROM jhipster/jhipster:v7.9.2
+FROM jhipster/jhipster:v8.0.0-beta.2
 USER jhipster
 COPY --chown=jhipster:jhipster . /home/jhipster/jhipster-online/
 RUN \
@@ -10,6 +10,10 @@ RUN \
     mv /home/jhipster/jhipster-online/target/*.war /home/jhipster && \
     rm -Rf /home/jhipster/jhipster-online/ /home/jhipster/.m2 /home/jhipster/.cache /tmp/* /var/tmp/*
 
+USER root
+RUN \
+    npm install -g generator-jhipster-azure-spring-apps
+
 ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
     JHIPSTER_SLEEP=0 \
     JAVA_OPTS=""

LICENSE.txt

@@ -1,5 +1,5 @@
 
-    Copyright 2017-2022 the original author or authors from the JHipster project
+    Copyright 2017-2023 the original author or authors from the JHipster project
 
                                  Apache License
                            Version 2.0, January 2004

NOTICE

@@ -1,4 +1,4 @@
 JHipster
-Copyright 2017-2022 the original author or authors from the JHipster project.
+Copyright 2017-2023 the original author or authors from the JHipster project.
 
 For more information on the JHipster project, see https://www.jhipster.tech/

README.md

@@ -174,13 +174,13 @@ You can also fully dockerize your application and all the services that it depen
 To achieve this, first build a docker image of your app by running:
 
 ```
-./mvnw package -Pprod dockerfile:build
+docker build -t jhonline .
 ```
 
 Then run:
 
 ```
-docker-compose -f src/main/docker/app.yml up -d
+docker compose -f src/main/docker/app.yml up -d
 ```
 
 ## Deployment to Google App Engine (GAE) Flexible Environment