Merge pull request #25933 from mshima/project-version

adjust project version for sonar

.blueprint/generate-sample/generator.mjs

@@ -1,6 +1,7 @@
 import { extname } from 'path';
 import { transform } from '@yeoman/transform';
 import BaseGenerator from '../../generators/base/index.js';
+import { packageJson } from '../../lib/index.js';
 import { generateSample } from './support/generate-sample.js';
 import { promptSamplesFolder } from '../support.mjs';
 import { GENERATOR_APP, GENERATOR_JDL } from '../../generators/generator-list.js';
@@ -9,12 +10,16 @@ export default class extends BaseGenerator {
   sampleName;
   global;
   projectFolder;
+  projectVersion;
 
   get [BaseGenerator.INITIALIZING]() {
     return this.asInitializingTaskGroup({
       async parseCommand() {
         await this.parseCurrentJHipsterCommand();
       },
+      projectVersion() {
+        this.projectVersion = `${packageJson.version}-git`;
+      },
     });
   }
 
@@ -35,6 +40,7 @@ export default class extends BaseGenerator {
 
         await this.composeWithJHipster(GENERATOR_JDL, {
           generatorArgs: [this.templatePath('samples', this.sampleName)],
+          generatorOptions: { projectVersion: this.projectVersion },
         });
       },
       async generateSample() {
@@ -52,7 +58,7 @@ export default class extends BaseGenerator {
           transform(() => {}),
         );
 
-        let generatorOptions = { ...sample.sample.generatorOptions };
+        let generatorOptions = { projectVersion: this.projectVersion, ...sample.sample.generatorOptions };
         if (sample.sample.workspaces && sample.sample.workspaces !== 'false') {
           generatorOptions = { ...generatorOptions, workspaces: true, monorepository: true };
         }

test-integration/scripts/99-build-changes.sh

@@ -114,6 +114,7 @@ echo "::endgroup::"
 
 echo "::group::Check Common"
 git -c color.ui=always diff --exit-code @~1 -- \
+  '.blueprint' \
   '.github/actions' \
   '.github/workflows' \
   'generators/app' \