add node and java to write-matrix

jhipster · Nov 13, 2023 · 970e257 · 970e257
1 parent 35d77d3
commit 970e257
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/generators/generator-constants.mts → generators/generator-constants.mjs b/generators/generator-constants.mts → generators/generator-constants.mjs
@@ -29,7 +29,10 @@ export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 export const NODE_VERSION = '18.18.2';
 export const OPENAPI_GENERATOR_CLI_VERSION = '2.7.0';
 
-export const javaDependencies: Record<string, string> = {
+/**
+ * @type {Record<string, string>}
+ */
+export const javaDependencies = {
   /**
    * spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
    */
@@ -52,9 +55,10 @@ export const ELASTICSEARCH_TAG = '8.7.1';
 export const ELASTICSEARCH_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch';
 
 /**
+ * @type {Record<string, string>}
  * Manually updated docker containers
  */
-export const dockerContainers: Record<string, string> = {
+export const dockerContainers = {
   elasticsearchTag: ELASTICSEARCH_TAG,
   elasticsearchImage: ELASTICSEARCH_IMAGE,
   elasticsearch: `${ELASTICSEARCH_IMAGE}:${ELASTICSEARCH_TAG}`,

diff --git a/test-integration/scripts/99-write-matrix.js b/test-integration/scripts/99-write-matrix.js
@@ -2,6 +2,7 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
+import { JAVA_VERSION, NODE_VERSION } from '../../generators/generator-constants.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const packageRoot = join(dirname(__filename), '../..');
@@ -39,6 +40,8 @@ writeFileSync(
                   'setup-entities-sample': sample.entity ?? 'none',
                   'setup-jdl-entities-sample': sample['jdl-entity'] ?? '',
                   'setup-jdl-sample': sample['jdl-samples'] ?? '',
+                  'java': sample['java'] ?? JAVA_VERSION,
+                  'node': sample['node'] ?? NODE_VERSION,
                 }));
             } catch (error) {
               console.log(`File ${file} not found`, error);