Merge pull request #227 from entando/ENG-3284-centralize-referenced-artifacts-versions

ENG-3284 Centralize referenced artifacts versions

Author: alepintus

generators/generator-constants.js

@@ -23,7 +23,8 @@ const DEFAULT_SERVER_PROMPTS = {
 
 const SCALA_LIBRARY_VERSION = '2.12.1';
 const MBKNOR_JACKSON_JSONSCHEMA_VERSION = '1.0.34';
-const ENTANDO_BUNDLE_BOM_VERSION = '7.0.0-ENG-3090-PR-7';
+const ENTANDO_BUNDLE_BOM_VERSION = '7.0.0-ENG-3251-PR-9';
+const ENTANDO_KEYCLOAK_DOCKER_IMAGE = 'entando/entando-keycloak:7.0.0-ENG-3087-PR-23';
 
 module.exports = {
   SQL_DB_OPTIONS,
@@ -35,4 +36,5 @@ module.exports = {
   SCALA_LIBRARY_VERSION,
   MBKNOR_JACKSON_JSONSCHEMA_VERSION,
   ENTANDO_BUNDLE_BOM_VERSION,
+  ENTANDO_KEYCLOAK_DOCKER_IMAGE,
 };

generators/server/index.js

@@ -29,6 +29,7 @@ module.exports = class extends ServerGenerator {
     const entandoPhase = {
       setupEntandoServerconsts() {
         this.ENTANDO_BUNDLE_BOM_VERSION = constants.ENTANDO_BUNDLE_BOM_VERSION;
+        this.ENTANDO_KEYCLOAK_DOCKER_IMAGE = constants.ENTANDO_KEYCLOAK_DOCKER_IMAGE;
       },
     };
 

generators/server/templates/src/main/docker/keycloak.yml.ejs

@@ -20,7 +20,7 @@
 version: '<%= DOCKER_COMPOSE_FORMAT_VERSION %>'
 services:
   keycloak:
-    image: entando/entando-keycloak:7.0.0-ENG-3087-PR-23
+    image: '<%= ENTANDO_KEYCLOAK_DOCKER_IMAGE %>'
     command: [
             '-b',
             '0.0.0.0',

test-integration/samples/maven-default-jhipster-bom/.yo-rc.json

@@ -7,7 +7,7 @@
     "bundleName": "test-bundle",
     "dockerImageOrganization": "aaaa",
     "generateMicroFrontends": "always",
-    "jhipsterVersion": "6.9.0",
+    "jhipsterVersion": "7.2.0",
     "applicationType": "microservice",
     "baseName": "test",
     "packageName": "com.mycompany.myapp",

test-integration/samples/maven-default-nodb/.yo-rc.json

@@ -7,7 +7,7 @@
     "bundleName": "test-bundle",
     "dockerImageOrganization": "aaaa",
     "generateMicroFrontends": "always",
-    "jhipsterVersion": "6.9.0",
+    "jhipsterVersion": "7.2.0",
     "applicationType": "microservice",
     "baseName": "test",
     "packageName": "com.mycompany.myapp",

test-integration/samples/maven-default/.yo-rc.json

@@ -7,7 +7,7 @@
     "bundleName": "test-bundle",
     "dockerImageOrganization": "aaaa",
     "generateMicroFrontends": "always",
-    "jhipsterVersion": "6.9.0",
+    "jhipsterVersion": "7.2.0",
     "applicationType": "microservice",
     "baseName": "test",
     "packageName": "com.mycompany.myapp",

test-integration/samples/maven-oracle-hazelcast/.yo-rc.json

@@ -7,7 +7,7 @@
     "bundleName": "test-bundle",
     "dockerImageOrganization": "aaaa",
     "generateMicroFrontends": "always",
-    "jhipsterVersion": "6.9.0",
+    "jhipsterVersion": "7.2.0",
     "applicationType": "microservice",
     "baseName": "test",
     "packageName": "com.mycompany.myapp",

test-integration/samples/maven-postgres-redis-jhipster-bom/.yo-rc.json

@@ -7,7 +7,7 @@
     "bundleName": "test-bundle",
     "dockerImageOrganization": "aaaa",
     "generateMicroFrontends": "always",
-    "jhipsterVersion": "6.9.0",
+    "jhipsterVersion": "7.2.0",
     "applicationType": "microservice",
     "baseName": "test",
     "packageName": "com.mycompany.myapp",

test-integration/samples/maven-postgres-redis/.yo-rc.json

@@ -7,7 +7,7 @@
     "bundleName": "test-bundle",
     "dockerImageOrganization": "aaaa",
     "generateMicroFrontends": "always",
-    "jhipsterVersion": "6.9.0",
+    "jhipsterVersion": "7.2.0",
     "applicationType": "microservice",
     "baseName": "test",
     "packageName": "com.mycompany.myapp",

test/server.spec.js

@@ -2,11 +2,14 @@ const path = require('path');
 const assert = require('yeoman-assert');
 const helpers = require('yeoman-test');
 const constants = require('generator-jhipster/generators/generator-constants');
+const entandoConstants = require('../generators/generator-constants');
 const expectedFiles = require('./utils/expected-files');
 
 const appBaseName = 'entandoPlugin';
 const { DOCKER_DIR, SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } = constants;
 
+const { ENTANDO_KEYCLOAK_DOCKER_IMAGE } = entandoConstants;
+
 describe('Subgenerator server of entando JHipster blueprint', () => {
   describe('With default blueprint configuration', () => {
     before(done => {
@@ -199,7 +202,7 @@ describe('Subgenerator server of entando JHipster blueprint', () => {
     });
 
     it('Keycloack docker file contains the Entando modifications', () => {
-      assert.fileContent(`${DOCKER_DIR}keycloak.yml`, 'entando/entando-keycloak:7.0.0-ENG-3087-PR-23');
+      assert.fileContent(`${DOCKER_DIR}keycloak.yml`, ENTANDO_KEYCLOAK_DOCKER_IMAGE);
       assert.fileContent(
         `${DOCKER_DIR}keycloak.yml`,
         'command: [\n' +