From 163a653c7e927c6a4e5f6da7b585384258a5a2da Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Thu, 17 Aug 2023 08:31:33 -0600 Subject: [PATCH 1/5] Upgrade Micronaut to 3.10.1 --- generators/constants.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index 5ef9ab79..4ec0e782 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -43,7 +43,7 @@ module.exports = { }, }, versions: { - micronaut: '3.9.5', + micronaut: '3.10.1', micronautData: '3.10.0', micronautDiscoveryClient: '3.3.1', micronautOpenApi: '4.8.7', From 08a41691372ecfa6a77bfc1f2ee0128b7c948f1a Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Thu, 17 Aug 2023 10:28:41 -0600 Subject: [PATCH 2/5] Update coordinates for MySQL --- generators/server/templates/build.gradle.ejs | 4 ++-- generators/server/templates/pom.xml.ejs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index c3103bd2..8b768ed5 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.ejs @@ -501,8 +501,8 @@ dependencies { implementation "io.springfox:springfox-bean-validators" <%_ } _%> <%_ if (devDatabaseType === 'mysql' || prodDatabaseType === 'mysql') { _%> - implementation "mysql:mysql-connector-java" - liquibaseRuntime "mysql:mysql-connector-java" + implementation "mysql:mysql-connector-j" + liquibaseRuntime "mysql:mysql-connector-j" <%_ } _%> <%_ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%> implementation "org.postgresql:postgresql" diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 11b0f47a..446a99ea 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -247,7 +247,7 @@ _%> if (devDatabaseType === 'mysql' || prodDatabaseType === 'mysql') { _%> mysql - mysql-connector-java + mysql-connector-j <%_ } _%> <%_ if (devDatabaseType === 'mariadb' || prodDatabaseType === 'mariadb') { _%> @@ -1150,7 +1150,7 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%> if (devDatabaseType === 'mysql') { _%> mysql - mysql-connector-java + mysql-connector-j <%_ } _%> <%_ @@ -1260,7 +1260,7 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%> if (prodDatabaseType === 'mysql') { _%> mysql - mysql-connector-java + mysql-connector-j <%_ } _%> <%_ From d34f581b3ea86b715704566078204ccf393352ca Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Thu, 17 Aug 2023 11:49:53 -0600 Subject: [PATCH 3/5] Fix group ID for MySQL --- generators/server/templates/build.gradle.ejs | 4 ++-- generators/server/templates/pom.xml.ejs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index 8b768ed5..4f2cc137 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.ejs @@ -501,8 +501,8 @@ dependencies { implementation "io.springfox:springfox-bean-validators" <%_ } _%> <%_ if (devDatabaseType === 'mysql' || prodDatabaseType === 'mysql') { _%> - implementation "mysql:mysql-connector-j" - liquibaseRuntime "mysql:mysql-connector-j" + implementation "com.mysql:mysql-connector-j" + liquibaseRuntime "com.mysql:mysql-connector-j" <%_ } _%> <%_ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%> implementation "org.postgresql:postgresql" diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 446a99ea..2a8d7be7 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -246,7 +246,7 @@ _%> <%_ if (devDatabaseType === 'mysql' || prodDatabaseType === 'mysql') { _%> - mysql + com.mysql mysql-connector-j <%_ } _%> @@ -1149,7 +1149,7 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%> <%_ if (devDatabaseType === 'mysql') { _%> - mysql + com.mysql mysql-connector-j <%_ } _%> @@ -1259,7 +1259,7 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%> <%_ if (prodDatabaseType === 'mysql') { _%> - mysql + com.mysql mysql-connector-j <%_ } _%> From 78b89852652acbac7dbe050ddc6bcfbeb3161801 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Thu, 17 Aug 2023 12:23:43 -0600 Subject: [PATCH 4/5] Use jhipster-dependencies 7.9.3 --- generators/server/generator.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/generator.mjs b/generators/server/generator.mjs index b0f7a34f..80b4e42f 100644 --- a/generators/server/generator.mjs +++ b/generators/server/generator.mjs @@ -92,7 +92,7 @@ export default class extends extendGenerator(ServerGenerator) { this.GRADLE_VERSION = mnConstants.GRADLE_VERSION; this.DOCKER_REDIS = mnConstants.DOCKER_REDIS; this.DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1'; // overrides jhipster value until main generator is updated - this.JHIPSTER_DEPENDENCIES_VERSION = '3.9.1'; + this.JHIPSTER_DEPENDENCIES_VERSION = '7.9.3'; }, }; } From 9946d7095ea464a468dd2231b21a198990894e0a Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Thu, 17 Aug 2023 13:32:41 -0600 Subject: [PATCH 5/5] Revert most changes, we can address in next version of blueprint --- generators/server/generator.mjs | 2 +- generators/server/templates/build.gradle.ejs | 4 ++-- generators/server/templates/pom.xml.ejs | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/generators/server/generator.mjs b/generators/server/generator.mjs index 80b4e42f..b0f7a34f 100644 --- a/generators/server/generator.mjs +++ b/generators/server/generator.mjs @@ -92,7 +92,7 @@ export default class extends extendGenerator(ServerGenerator) { this.GRADLE_VERSION = mnConstants.GRADLE_VERSION; this.DOCKER_REDIS = mnConstants.DOCKER_REDIS; this.DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1'; // overrides jhipster value until main generator is updated - this.JHIPSTER_DEPENDENCIES_VERSION = '7.9.3'; + this.JHIPSTER_DEPENDENCIES_VERSION = '3.9.1'; }, }; } diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index 4f2cc137..c3103bd2 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.ejs @@ -501,8 +501,8 @@ dependencies { implementation "io.springfox:springfox-bean-validators" <%_ } _%> <%_ if (devDatabaseType === 'mysql' || prodDatabaseType === 'mysql') { _%> - implementation "com.mysql:mysql-connector-j" - liquibaseRuntime "com.mysql:mysql-connector-j" + implementation "mysql:mysql-connector-java" + liquibaseRuntime "mysql:mysql-connector-java" <%_ } _%> <%_ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%> implementation "org.postgresql:postgresql" diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 2a8d7be7..11b0f47a 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -246,8 +246,8 @@ _%> <%_ if (devDatabaseType === 'mysql' || prodDatabaseType === 'mysql') { _%> - com.mysql - mysql-connector-j + mysql + mysql-connector-java <%_ } _%> <%_ if (devDatabaseType === 'mariadb' || prodDatabaseType === 'mariadb') { _%> @@ -1149,8 +1149,8 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%> <%_ if (devDatabaseType === 'mysql') { _%> - com.mysql - mysql-connector-j + mysql + mysql-connector-java <%_ } _%> <%_ @@ -1259,8 +1259,8 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%> <%_ if (prodDatabaseType === 'mysql') { _%> - com.mysql - mysql-connector-j + mysql + mysql-connector-java <%_ } _%> <%_