From c0bbb49895d301d7f11496e8f196682505196e1d Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 25 Jul 2021 20:19:21 +0100 Subject: [PATCH 1/5] Update generator-constants.js --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index ae507f35f61..900d6cf885b 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -35,7 +35,7 @@ const JIB_VERSION = '3.1.1'; // Libraries version const JHIPSTER_DEPENDENCIES_VERSION = '7.1.1-SNAPSHOT'; // The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION -const SPRING_BOOT_VERSION = '2.5.2'; +const SPRING_BOOT_VERSION = '2.5.3'; const LIQUIBASE_VERSION = '4.3.5'; const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('.'); const HIBERNATE_VERSION = '5.4.32.Final'; From 908cbdb4c9bbbc213b76fa2970eb69ad30a0316f Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Mon, 26 Jul 2021 12:36:22 +0100 Subject: [PATCH 2/5] Use specific bom branch --- .github/actions/setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 0bb02ac888f..7d654bd46bb 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -71,7 +71,7 @@ inputs: jhipster-bom-branch: description: 'JHipster BOM branch' required: false - default: auto + default: dependabot/maven/org.springframework.boot-spring-boot-dependencies-2.5.3 jhipster-bom-directory: description: 'JHipster BOM path' required: false From 21e9ce2850a39d9e272d239865f379ec7cf51624 Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Mon, 26 Jul 2021 12:36:26 +0100 Subject: [PATCH 3/5] Use specific bom branch --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 367e4626d78..73292280456 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,7 +29,7 @@ jobs: variables: # if JHI_LIB_BRANCH value is release, use the release from Maven JHI_LIB_REPO: https://github.com/jhipster/jhipster-bom.git - JHI_LIB_BRANCH: main + JHI_LIB_BRANCH: dependabot/maven/org.springframework.boot-spring-boot-dependencies-2.5.3 # if JHI_GEN_BRANCH value is release, use the release from NPM JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git JHI_GEN_BRANCH: main From 311abd2f4a9a03a4274856ebc6bfd3dbf8822ba5 Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Mon, 26 Jul 2021 14:18:26 +0100 Subject: [PATCH 4/5] Revert "Use specific bom branch" --- .github/actions/setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 7d654bd46bb..0bb02ac888f 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -71,7 +71,7 @@ inputs: jhipster-bom-branch: description: 'JHipster BOM branch' required: false - default: dependabot/maven/org.springframework.boot-spring-boot-dependencies-2.5.3 + default: auto jhipster-bom-directory: description: 'JHipster BOM path' required: false From c16d45af32bd110b0aa4c96093ebd2b55664fe47 Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Mon, 26 Jul 2021 14:18:28 +0100 Subject: [PATCH 5/5] Revert "Use specific bom branch" --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 73292280456..367e4626d78 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,7 +29,7 @@ jobs: variables: # if JHI_LIB_BRANCH value is release, use the release from Maven JHI_LIB_REPO: https://github.com/jhipster/jhipster-bom.git - JHI_LIB_BRANCH: dependabot/maven/org.springframework.boot-spring-boot-dependencies-2.5.3 + JHI_LIB_BRANCH: main # if JHI_GEN_BRANCH value is release, use the release from NPM JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git JHI_GEN_BRANCH: main