Docker cache

.dockerignore

@@ -1 +1,2 @@
-node_modules
+node_modules/
+target/

.eslintrc.cjs

@@ -6,6 +6,7 @@ module.exports = {
   parserOptions: {
     parser: '@typescript-eslint/parser',
   },
+  plugins: ['pug'],
   rules: {
     quotes: ['error', 'single', { avoidEscape: true }],
     '@typescript-eslint/no-unused-vars': ['error'],

.github/actions/setup/action.yml

@@ -8,14 +8,15 @@ inputs:
   node-version:
     description: 'Node version to use'
     required: true
-    default: '20.11.1'
+    default: 'lts/*'
 runs:
   using: 'composite'
   steps:
     - name: 'Setup: Node.js'
       uses: actions/setup-node@v4
       with:
         node-version: '${{ inputs.node-version }}'
+        check-latest: true
     - name: 'Setup: update NPM'
       shell: bash
       run: npm install -g npm
@@ -24,6 +25,7 @@ runs:
       with:
         distribution: 'temurin'
         java-version: '${{ inputs.java-version }}'
+        check-latest: true
     - name: 'Disable maven interactive mode'
       shell: bash
       run: |

.github/dependabot.yml

@@ -52,14 +52,6 @@ updates:
     labels:
       - 'area: dependencies'
 
-  - package-ecosystem: 'npm'
-    directory: '/'
-    schedule:
-      interval: 'daily'
-      time: '00:00'
-    open-pull-requests-limit: 10
-    labels:
-      - 'area: dependencies'
   - package-ecosystem: 'npm'
     directory: '/src/main/resources/generator/dependencies/common'
     schedule:

.github/workflows/github-actions.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Get the head commit message
         id: commit-message
         run: |
-          head_commit_message=$(git log -1 --no-merges --pretty=%B | tr '\n' ' ')
+          head_commit_message=$(git log -1 --no-merges --pretty=%B | tr '\n' ' ' | sed "s/'/'\\\\''/g")
           echo head commit message: $head_commit_message
           echo "message=$head_commit_message" >> $GITHUB_OUTPUT
       - name: Check for ci skip tags
@@ -76,6 +76,8 @@ jobs:
       - name: 'Init: install Node.js packages'
         run: npm ci
       - name: 'Test: run backend tests'
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         run: |
           ./mvnw clean verify
   #--------------------------------------------------
@@ -104,14 +106,16 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: 'Start local Sonar'
-        run: docker-compose -f src/main/docker/sonar.yml up -d
+        run: docker compose -f src/main/docker/sonar.yml up -d
       - name: 'Init: install Node.js packages'
         run: npm ci
       - name: 'Lint: check'
         run: npm run lint:ci
       - name: 'TEMP: enable gradle build tool slug'
         run: sed -i '/- gradle-java/d' src/main/resources/config/application.yml
       - name: 'Test: run backend tests'
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         run: |
           chmod +x mvnw
           ./mvnw clean verify -Dsonar.qualitygate.wait=true sonar:sonar
@@ -124,18 +128,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: ./mvnw initialize sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.projectKey=jhipster_jhipster-lite -Dsonar.organization=jhipster -Dsonar.login= -Dsonar.password=
-      - name: 'Artifact: upload JaCoCo report'
-        uses: actions/upload-artifact@v4
-        with:
-          name: jacoco
-          path: '${{ github.workspace }}/target/jacoco/jacoco.xml'
-          retention-days: 1
-      - name: 'Artifact: upload lcov report'
-        uses: actions/upload-artifact@v4
-        with:
-          name: lcov
-          path: '${{ github.workspace }}/target/test-results/lcov.info'
-          retention-days: 1
       - name: 'Artifact: remove unused JARs'
         run: |
           rm target/*-javadoc.jar target/*-sources.jar
@@ -259,8 +251,14 @@ jobs:
         include:
           - java-build-tool: maven
           - spring-config-format: yaml
-          - app: customjhlite
+          - java-version: 21
+          - node-version: 'lts/*'
+          - app: mariadbapp
             spring-config-format: properties
+          - app: consulapp
+            java-version: 22
+          - app: vueapp
+            node-version: 'latest'
           - app: gradleapp
             java-build-tool: gradle
     steps:
@@ -311,9 +309,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: 'current-branch'
-      - name: 'Setup: environment'
+      - name: 'Setup: environment (java: ${{ matrix.java-version }}, node: ${{ matrix.node-version }})'
         id: setup
         uses: ./current-branch/.github/actions/setup
+        with:
+          java-version: ${{ matrix.java-version }}
+          node-version: ${{ matrix.node-version }}
       - name: 'Artifact: download JAR'
         uses: actions/download-artifact@v4
         with:
@@ -415,7 +416,7 @@ jobs:
         working-directory: /tmp/jhlite/${{ matrix.app }}/
         run: |
           if [ -f 'src/main/docker/sonar.yml' ]; then
-            docker-compose -f src/main/docker/sonar.yml up -d
+            docker compose -f src/main/docker/sonar.yml up -d
             ${{ github.workspace }}/current-branch/tests-ci/wait_sonar.sh
             docker ps -a
           fi
@@ -448,7 +449,7 @@ jobs:
       - name: 'Test: copy shell scripts'
         if: steps.tests-requirement-check.outputs.execute_tests == 'true'
         run: cp ./current-branch/tests-ci/start.sh /tmp/jhlite/${{ matrix.app }}/
-      - name: 'Test: start docker compose services'
+      - name: 'Test: start docker-compose services'
         if: steps.tests-requirement-check.outputs.execute_tests == 'true'
         working-directory: ./current-branch/tests-ci/
         run: |
@@ -462,47 +463,12 @@ jobs:
             ./start.sh
           fi
 
-  #--------------------------------------------------
-  # Send analysis to Codecov
-  #--------------------------------------------------
-  codecov:
-    needs: [setup, cypress]
-    name: codecov
-    if: >-
-      github.repository == 'jhipster/jhipster-lite' &&
-      needs.setup.outputs.skip_ci != 'true'
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: 'Setup: checkout project'
-        uses: actions/checkout@v4
-      - name: 'Artifact: download JaCoCo report'
-        uses: actions/download-artifact@v4
-        with:
-          name: jacoco
-      - name: 'Artifact: download lcov report'
-        uses: actions/download-artifact@v4
-        with:
-          name: lcov
-      - name: 'Codecov: sending JaCoCo analysis...'
-        uses: codecov/codecov-action@v3
-        with:
-          files: jacoco.xml
-          fail_ci_if_error: true
-          verbose: true
-      - name: 'Codecov: sending lcov analysis...'
-        uses: codecov/codecov-action@v3
-        with:
-          files: lcov.info
-          fail_ci_if_error: true
-          verbose: true
-
   #--------------------------------------------------
   # Configuration for Status checks that are required
   #--------------------------------------------------
   status-checks:
     name: status-checks
-    needs: [tests-linux, codecov, generation]
+    needs: [tests-linux, generation]
     permissions:
       contents: none
     if: always()
@@ -513,7 +479,7 @@ jobs:
         run: |
           echo 'Configuration for Status checks that are required'
           echo '${{ toJSON(needs) }}'
-          if [[ (('skipped' == '${{ needs.tests-linux.result }}') || ('success' == '${{ needs.tests-linux.result }}')) && (('skipped' == '${{ needs.codecov.result }}') || ('success' == '${{ needs.codecov.result }}')) && (('skipped' == '${{ needs.generation.result }}') || ('success' == '${{ needs.generation.result }}')) ]]; then
+          if [[ (('skipped' == '${{ needs.tests-linux.result }}') || ('success' == '${{ needs.tests-linux.result }}')) && (('skipped' == '${{ needs.generation.result }}') || ('success' == '${{ needs.generation.result }}')) ]]; then
             exit 0
           fi
           exit 1
@@ -532,7 +498,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.1.0
       - 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/publish-jvm-docker-image.yml

@@ -30,16 +30,37 @@ jobs:
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.1.0
         id: login-hub
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Restore cache for local Maven repository
+        id: cache
+        uses: actions/cache@v4
+        with:
+          path: maven-repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+
+      - name: inject maven-cache into docker
+        uses: reproducible-containers/buildkit-cache-dance@v3.1.0
+        with:
+          cache-map: |
+            {
+              "maven-repository": "/root/.m2"
+            }
+          skip-extraction: ${{ steps.cache.outputs.cache-hit }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build the JVM-based Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           push: ${{ startsWith(github.ref, 'refs/tags/v') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/publish-native-docker-image.yml

@@ -46,7 +46,7 @@ jobs:
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.1.0
         id: login-hub
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}

.gitignore

@@ -190,3 +190,8 @@ dist/
 # Spring personal profile
 ######################
 src/main/resources/config/application-perso.*
+
+######################
+# Gradle Develocity Settings
+######################
+.mvn/.develocity/develocity-workspace-id

.jhipster/modules/history.json

@@ -1,27 +1,31 @@
 {
-  "actions" : [ {
-    "module" : "application-service-hexagonal-architecture-documentation",
-    "date" : "2022-07-29T05:45:39.864617462Z",
-    "properties" : { }
-  }, {
-    "module" : "maven-java",
-    "date" : "2024-01-29T22:31:20.121046866Z",
-    "properties" : {
-      "packageName" : "com.mycompany.myapp",
-      "projectName" : "JHipster Sample Application",
-      "baseName" : "jhipsterSampleApplication",
-      "endOfLine" : "lf",
-      "indentSize" : 2
+  "actions": [
+    {
+      "module": "application-service-hexagonal-architecture-documentation",
+      "date": "2022-07-29T05:45:39.864617462Z",
+      "properties": {}
+    },
+    {
+      "module": "maven-java",
+      "date": "2024-01-29T22:31:20.121046866Z",
+      "properties": {
+        "packageName": "com.mycompany.myapp",
+        "projectName": "JHipster Sample Application",
+        "baseName": "jhipsterSampleApplication",
+        "endOfLine": "lf",
+        "indentSize": 2
+      }
+    },
+    {
+      "module": "jacoco-check-min-coverage",
+      "date": "2024-01-29T22:31:20.126024517Z",
+      "properties": {
+        "packageName": "com.mycompany.myapp",
+        "projectName": "JHipster Sample Application",
+        "baseName": "jhipsterSampleApplication",
+        "endOfLine": "lf",
+        "indentSize": 2
+      }
     }
-  }, {
-    "module" : "jacoco-check-min-coverage",
-    "date" : "2024-01-29T22:31:20.126024517Z",
-    "properties" : {
-      "packageName" : "com.mycompany.myapp",
-      "projectName" : "JHipster Sample Application",
-      "baseName" : "jhipsterSampleApplication",
-      "endOfLine" : "lf",
-      "indentSize" : 2
-    }
-  } ]
+  ]
 }

.lintstagedrc.js

@@ -1,7 +1,7 @@
 export default {
   '{src/test/javascript,src/main/webapp}/**/*.{js,ts,tsx,vue}': ['eslint --fix'],
-  'src/main/style/**/*.{css,scss}': ['stylelint --fix'],
-  'src/main/style/**/*.pug': ['pug-lint'],
-  '{{src/**/,}*.{md,json,yml,html,vue,java,xml,feature},*.{js,ts},.github/**/*.yml,documentation/**/*.md,src/{main/webapp,main/glyph,test/javascript}/**/*.{css,scss}}':
-    ['prettier --write'],
+  'src/main/style/**/*.{css,scss}': ['stylelint --fix', 'prettier --write'],
+  'src/main/glyph/**/*.{css,scss}': ['prettier --write'],
+  'src/main/style/**/*.pug': ['eslint --fix', 'prettier --write'],
+  '{{**/,}*.{md,json,yml,html,java,xml,feature},*.{js,cjs,ts}}': ['prettier --write'],
 };

.mvn/develocity.xml

@@ -0,0 +1,30 @@
+<develocity
+  xmlns="https://www.gradle.com/develocity-maven"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd"
+>
+  <server>
+    <url>https://ge.jhipster.tech</url>
+  </server>
+  <buildScan>
+    <capture>
+      <fileFingerprints>true</fileFingerprints>
+    </capture>
+    <publishing>
+      <onlyIf><![CDATA[!buildResult.failures.empty && authenticated]]></onlyIf>
+    </publishing>
+    <backgroundBuildScanUpload>#{env['CI'] == null}</backgroundBuildScanUpload>
+    <obfuscation>
+      <ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
+    </obfuscation>
+  </buildScan>
+  <buildCache>
+    <local>
+      <enabled>true</enabled>
+    </local>
+    <remote>
+      <enabled>true</enabled>
+      <storeEnabled>#{isTrue(env['GITHUB_ACTIONS']) and isTrue(env['DEVELOCITY_ACCESS_KEY'])}</storeEnabled>
+    </remote>
+  </buildCache>
+</develocity>

.mvn/extensions.xml

@@ -0,0 +1,12 @@
+<extensions>
+  <extension>
+    <groupId>com.gradle</groupId>
+    <artifactId>develocity-maven-extension</artifactId>
+    <version>1.21.2</version>
+  </extension>
+  <extension>
+    <groupId>com.gradle</groupId>
+    <artifactId>common-custom-user-data-maven-extension</artifactId>
+    <version>2</version>
+  </extension>
+</extensions>