From 829b5bef17e346c0d710c2fe0b4dacc709d7913d Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 16 Mar 2024 16:29:50 -0300 Subject: [PATCH 1/5] add spring-cloud-dependencies --- generators/spring-boot/generator.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts index 12c8293aa8c8..c16941be4af2 100644 --- a/generators/spring-boot/generator.ts +++ b/generators/spring-boot/generator.ts @@ -406,6 +406,10 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) { get postWriting() { return this.asPostWritingTaskGroup({ addJHipsterBomDependencies({ application, source }) { + const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, jhipsterDependenciesVersion, messageBrokerAny } = + application; + const { serviceDiscoveryAny } = application as any; + source.addJavaDependencies?.([ { groupId: 'tech.jhipster', @@ -416,6 +420,18 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) { }, { groupId: 'tech.jhipster', artifactId: 'jhipster-framework' }, ]); + + if (applicationTypeGateway || applicationTypeMicroservice || serviceDiscoveryAny || messageBrokerAny) { + source.addJavaDependencies?.([ + { + groupId: 'org.springframework.cloud', + artifactId: 'spring-cloud-dependencies', + type: 'pom', + scope: 'import', + version: javaDependencies!['spring-cloud-dependencies'], + }, + ]); + } }, addSpringdoc({ application, source }) { const springdocDependency = `springdoc-openapi-starter-${application.reactive ? 'webflux' : 'webmvc'}-api`; From 70fde2c658f3dbf6e05d351adfb946a977c58bca Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 16 Mar 2024 17:47:33 -0300 Subject: [PATCH 2/5] add feign reactor using api --- generators/server/templates/build.gradle.ejs | 9 --------- generators/server/templates/pom.xml.ejs | 14 -------------- generators/spring-boot/generator.ts | 12 ++++++++++++ 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index 43d5bbd04d4a..65085730cbed 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.ejs @@ -167,15 +167,6 @@ dependencies { implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" <%_ if (authenticationTypeOauth2) { _%> implementation "com.github.ben-manes.caffeine:caffeine" -<%_ } _%> -<%_ if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) { _%> - implementation "com.playtika.reactivefeign:feign-reactor-cloud" -<%_ } _%> -<%_ if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) { _%> - implementation "com.playtika.reactivefeign:feign-reactor-spring-configuration" -<%_ } _%> -<%_ if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) { _%> - implementation "com.playtika.reactivefeign:feign-reactor-webclient" <%_ } _%> testImplementation("com.tngtech.archunit:archunit-junit5-api:${archunitJunit5Version}") { exclude group: "org.slf4j", module: "slf4j-api" diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 96ce67895a95..f2dc84abc5e9 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -115,20 +115,6 @@ com.github.ben-manes.caffeine caffeine -<%_ } _%> -<%_ if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) { _%> - - com.playtika.reactivefeign - feign-reactor-cloud - - - com.playtika.reactivefeign - feign-reactor-spring-configuration - - - com.playtika.reactivefeign - feign-reactor-webclient - <%_ } _%> com.tngtech.archunit diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts index c16941be4af2..7fc7e68128d9 100644 --- a/generators/spring-boot/generator.ts +++ b/generators/spring-boot/generator.ts @@ -437,6 +437,18 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) { const springdocDependency = `springdoc-openapi-starter-${application.reactive ? 'webflux' : 'webmvc'}-api`; source.addJavaDependencies?.([{ groupId: 'org.springdoc', artifactId: springdocDependency }]); }, + addFeignReactor({ application, source }) { + const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, reactive } = application; + if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) { + const groupId = 'com.playtika.reactivefeign'; + source.addJavaDependencies?.([ + { groupId, artifactId: 'feign-reactor-bom', type: 'pom', scope: 'import', version: javaDependencies!['feign-reactor-bom'] }, + { groupId, artifactId: 'feign-reactor-cloud' }, + { groupId, artifactId: 'feign-reactor-spring-configuration' }, + { groupId, artifactId: 'feign-reactor-webclient' }, + ]); + } + }, addSpringSnapshotRepository({ application, source }) { if (application.buildToolMaven) { if (application.addSpringMilestoneRepository) { From 60cb1ad3258658a2688714cfafc2f8610980e18e Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 20 Mar 2024 22:05:19 -0300 Subject: [PATCH 3/5] add spring-data dependencies --- generators/spring-data-cassandra/generator.js | 4 ++-- generators/spring-data-mongodb/generator.js | 3 ++- generators/spring-data-neo4j/generator.ts | 8 +++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/generators/spring-data-cassandra/generator.js b/generators/spring-data-cassandra/generator.js index 876b12135078..3e322b89b6cd 100644 --- a/generators/spring-data-cassandra/generator.js +++ b/generators/spring-data-cassandra/generator.js @@ -88,14 +88,14 @@ export default class CassandraGenerator extends BaseApplicationGenerator { }); }, addDependencies({ application, source }) { - const { reactive } = application; + const { reactive, javaDependencies } = application; const cassandraStarter = reactive ? 'spring-boot-starter-data-cassandra-reactive' : 'spring-boot-starter-data-cassandra'; source.addJavaDependencies?.([ { groupId: 'com.datastax.oss', artifactId: 'java-driver-mapper-runtime' }, { groupId: 'commons-codec', artifactId: 'commons-codec' }, { groupId: 'org.springframework.boot', artifactId: cassandraStarter }, - { groupId: 'org.lz4', artifactId: 'lz4-java' }, + { groupId: 'org.lz4', artifactId: 'lz4-java', version: javaDependencies['lz4-java'] }, { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' }, { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' }, { scope: 'test', groupId: 'org.testcontainers', artifactId: 'cassandra' }, diff --git a/generators/spring-data-mongodb/generator.js b/generators/spring-data-mongodb/generator.js index efdf1b6b8713..5995cf17efb5 100644 --- a/generators/spring-data-mongodb/generator.js +++ b/generators/spring-data-mongodb/generator.js @@ -65,8 +65,9 @@ export default class MongoDBGenerator extends BaseApplicationGenerator { }); }, addDependencies({ application, source }) { - const { reactive } = application; + const { reactive, javaDependencies } = application; source.addJavaDependencies?.([ + { groupId: 'io.mongock', artifactId: 'mongock-bom', type: 'pom', version: javaDependencies['mongock-bom'], scope: 'import' }, { groupId: 'io.mongock', artifactId: 'mongock-springboot-v3' }, { groupId: 'org.springframework.boot', artifactId: `spring-boot-starter-data-mongodb${reactive ? '-reactive' : ''}` }, { groupId: 'io.mongock', artifactId: reactive ? 'mongodb-reactive-driver' : 'mongodb-springdata-v4-driver' }, diff --git a/generators/spring-data-neo4j/generator.ts b/generators/spring-data-neo4j/generator.ts index 9ddd63053057..ca15fae61d1e 100644 --- a/generators/spring-data-neo4j/generator.ts +++ b/generators/spring-data-neo4j/generator.ts @@ -155,7 +155,13 @@ export default class Neo4jGenerator extends BaseApplicationGenerator { { scope: 'test', groupId: 'org.testcontainers', artifactId: 'neo4j' }, ]); if (!application.databaseMigrationLiquibase) { - source.addJavaDependencies?.([{ groupId: 'eu.michael-simons.neo4j', artifactId: 'neo4j-migrations-spring-boot-starter' }]); + source.addJavaDependencies?.([ + { + groupId: 'eu.michael-simons.neo4j', + artifactId: 'neo4j-migrations-spring-boot-starter', + version: application.javaDependencies!['neo4j-migrations-spring-boot-starter'], + }, + ]); } }, }); From 9eee1668e2b7f2c1838c0255fbda2d64ecbc14d2 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 15 Mar 2024 16:38:35 -0300 Subject: [PATCH 4/5] drop jhipster-dependencies --- .../app/__snapshots__/generator.spec.ts.snap | 21 +++++++++++++++++++ .../resources/gradle/libs.versions.toml | 15 +++++++++++++ generators/server/templates/build.gradle.ejs | 3 --- .../templates/gradle/profile_dev.gradle.ejs | 2 +- generators/server/templates/pom.xml.ejs | 7 +++++++ generators/spring-boot/generator.ts | 19 +++++++++-------- 6 files changed, 54 insertions(+), 13 deletions(-) diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap index f0cbe7972390..763cef5fbab3 100644 --- a/generators/app/__snapshots__/generator.spec.ts.snap +++ b/generators/app/__snapshots__/generator.spec.ts.snap @@ -473,6 +473,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "common-custom-user-data-gradle-plugin": "'COMMON-CUSTOM-USER-DATA-GRADLE-PLUGIN-VERSION'", "commons-beanutils": "'COMMONS-BEANUTILS-VERSION'", "cucumber-bom": "'CUCUMBER-BOM-VERSION'", + "feign-reactor-bom": "'FEIGN-REACTOR-BOM-VERSION'", "frontend-maven-plugin": "'FRONTEND-MAVEN-PLUGIN-VERSION'", "gatling": "'GATLING-VERSION'", "gatling-gradle": "'GATLING-GRADLE-VERSION'", @@ -490,6 +491,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "jhipster-dependabot": "'JHIPSTER-DEPENDABOT-VERSION'", "jib-maven-plugin": "'JIB-MAVEN-PLUGIN-VERSION'", "lifecycle-mapping": "'LIFECYCLE-MAPPING-VERSION'", + "lz4-java": "'LZ-4-JAVA-VERSION'", "mapstruct": "'MAPSTRUCT-VERSION'", "maven-antrun-plugin": "'MAVEN-ANTRUN-PLUGIN-VERSION'", "maven-checkstyle-plugin": "'MAVEN-CHECKSTYLE-PLUGIN-VERSION'", @@ -505,6 +507,8 @@ exports[`generator - app with default config should match snapshot 1`] = ` "maven-war-plugin": "'MAVEN-WAR-PLUGIN-VERSION'", "micrometer-context-propagation": "'MICROMETER-CONTEXT-PROPAGATION-VERSION'", "modernizer-maven-plugin": "'MODERNIZER-MAVEN-PLUGIN-VERSION'", + "mongock-bom": "'MONGOCK-BOM-VERSION'", + "neo4j-migrations-spring-boot-starter": "'NEO-4-J-MIGRATIONS-SPRING-BOOT-STARTER-VERSION'", "node-gradle": "'NODE-GRADLE-VERSION'", "nohttp-checkstyle": "'NOHTTP-CHECKSTYLE-VERSION'", "openapi-generator-maven-plugin": "'OPENAPI-GENERATOR-MAVEN-PLUGIN-VERSION'", @@ -515,6 +519,9 @@ exports[`generator - app with default config should match snapshot 1`] = ` "spotless-gradle-plugin": "'SPOTLESS-GRADLE-PLUGIN-VERSION'", "spotless-maven-plugin": "'SPOTLESS-MAVEN-PLUGIN-VERSION'", "spring-boot": "'SPRING-BOOT-VERSION'", + "spring-cloud-dependencies": "'SPRING-CLOUD-DEPENDENCIES-VERSION'", + "spring-dependency-management": "'SPRING-DEPENDENCY-MANAGEMENT-VERSION'", + "springdoc": "'SPRINGDOC-VERSION'", "testng": "'TESTNG-VERSION'", "typesafe": "'TYPESAFE-VERSION'", "xmemcached": "'XMEMCACHED-VERSION'", @@ -1042,6 +1049,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "common-custom-user-data-gradle-plugin": "'COMMON-CUSTOM-USER-DATA-GRADLE-PLUGIN-VERSION'", "commons-beanutils": "'COMMONS-BEANUTILS-VERSION'", "cucumber-bom": "'CUCUMBER-BOM-VERSION'", + "feign-reactor-bom": "'FEIGN-REACTOR-BOM-VERSION'", "frontend-maven-plugin": "'FRONTEND-MAVEN-PLUGIN-VERSION'", "gatling": "'GATLING-VERSION'", "gatling-gradle": "'GATLING-GRADLE-VERSION'", @@ -1057,6 +1065,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "jhipster-dependabot": "'JHIPSTER-DEPENDABOT-VERSION'", "jib-maven-plugin": "'JIB-MAVEN-PLUGIN-VERSION'", "lifecycle-mapping": "'LIFECYCLE-MAPPING-VERSION'", + "lz4-java": "'LZ-4-JAVA-VERSION'", "mapstruct": "'MAPSTRUCT-VERSION'", "maven-antrun-plugin": "'MAVEN-ANTRUN-PLUGIN-VERSION'", "maven-checkstyle-plugin": "'MAVEN-CHECKSTYLE-PLUGIN-VERSION'", @@ -1072,6 +1081,8 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "maven-war-plugin": "'MAVEN-WAR-PLUGIN-VERSION'", "micrometer-context-propagation": "'MICROMETER-CONTEXT-PROPAGATION-VERSION'", "modernizer-maven-plugin": "'MODERNIZER-MAVEN-PLUGIN-VERSION'", + "mongock-bom": "'MONGOCK-BOM-VERSION'", + "neo4j-migrations-spring-boot-starter": "'NEO-4-J-MIGRATIONS-SPRING-BOOT-STARTER-VERSION'", "node-gradle": "'NODE-GRADLE-VERSION'", "nohttp-checkstyle": "'NOHTTP-CHECKSTYLE-VERSION'", "openapi-generator-maven-plugin": "'OPENAPI-GENERATOR-MAVEN-PLUGIN-VERSION'", @@ -1081,6 +1092,9 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "spotless-gradle-plugin": "'SPOTLESS-GRADLE-PLUGIN-VERSION'", "spotless-maven-plugin": "'SPOTLESS-MAVEN-PLUGIN-VERSION'", "spring-boot": "'SPRING-BOOT-VERSION'", + "spring-cloud-dependencies": "'SPRING-CLOUD-DEPENDENCIES-VERSION'", + "spring-dependency-management": "'SPRING-DEPENDENCY-MANAGEMENT-VERSION'", + "springdoc": "'SPRINGDOC-VERSION'", "testng": "'TESTNG-VERSION'", }, "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/", @@ -1605,6 +1619,7 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "common-custom-user-data-gradle-plugin": "'COMMON-CUSTOM-USER-DATA-GRADLE-PLUGIN-VERSION'", "commons-beanutils": "'COMMONS-BEANUTILS-VERSION'", "cucumber-bom": "'CUCUMBER-BOM-VERSION'", + "feign-reactor-bom": "'FEIGN-REACTOR-BOM-VERSION'", "frontend-maven-plugin": "'FRONTEND-MAVEN-PLUGIN-VERSION'", "gatling": "'GATLING-VERSION'", "gatling-gradle": "'GATLING-GRADLE-VERSION'", @@ -1622,6 +1637,7 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "jhipster-dependabot": "'JHIPSTER-DEPENDABOT-VERSION'", "jib-maven-plugin": "'JIB-MAVEN-PLUGIN-VERSION'", "lifecycle-mapping": "'LIFECYCLE-MAPPING-VERSION'", + "lz4-java": "'LZ-4-JAVA-VERSION'", "mapstruct": "'MAPSTRUCT-VERSION'", "maven-antrun-plugin": "'MAVEN-ANTRUN-PLUGIN-VERSION'", "maven-checkstyle-plugin": "'MAVEN-CHECKSTYLE-PLUGIN-VERSION'", @@ -1637,6 +1653,8 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "maven-war-plugin": "'MAVEN-WAR-PLUGIN-VERSION'", "micrometer-context-propagation": "'MICROMETER-CONTEXT-PROPAGATION-VERSION'", "modernizer-maven-plugin": "'MODERNIZER-MAVEN-PLUGIN-VERSION'", + "mongock-bom": "'MONGOCK-BOM-VERSION'", + "neo4j-migrations-spring-boot-starter": "'NEO-4-J-MIGRATIONS-SPRING-BOOT-STARTER-VERSION'", "node-gradle": "'NODE-GRADLE-VERSION'", "nohttp-checkstyle": "'NOHTTP-CHECKSTYLE-VERSION'", "openapi-generator-maven-plugin": "'OPENAPI-GENERATOR-MAVEN-PLUGIN-VERSION'", @@ -1647,6 +1665,9 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "spotless-gradle-plugin": "'SPOTLESS-GRADLE-PLUGIN-VERSION'", "spotless-maven-plugin": "'SPOTLESS-MAVEN-PLUGIN-VERSION'", "spring-boot": "'SPRING-BOOT-VERSION'", + "spring-cloud-dependencies": "'SPRING-CLOUD-DEPENDENCIES-VERSION'", + "spring-dependency-management": "'SPRING-DEPENDENCY-MANAGEMENT-VERSION'", + "springdoc": "'SPRINGDOC-VERSION'", "testng": "'TESTNG-VERSION'", "typesafe": "'TYPESAFE-VERSION'", "xmemcached": "'XMEMCACHED-VERSION'", diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml index fed79166bce5..324eedd6d2c6 100644 --- a/generators/server/resources/gradle/libs.versions.toml +++ b/generators/server/resources/gradle/libs.versions.toml @@ -1,9 +1,24 @@ [libraries] +spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2023.0.0' } + +springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.4.0' } + +feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', version = '4.0.3' } + # Cucumber testng = { module = 'org.testng:testng', version = '7.9.0' } cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.15.0' } +mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.0' } + +neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.9.2' } + +# Cassandra +lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' } + [plugins] +spring-dependency-management = { id = 'io.spring.dependency-management', version = '1.1.4' } + gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.1' } node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.1' } diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index 65085730cbed..6b3b6d179324 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.ejs @@ -160,9 +160,6 @@ repositories { } dependencies { - // Allows unversioned annotationProcessor - annotationProcessor platform(libs.jhipster.dependencies) - implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" <%_ if (authenticationTypeOauth2) { _%> diff --git a/generators/server/templates/gradle/profile_dev.gradle.ejs b/generators/server/templates/gradle/profile_dev.gradle.ejs index af639076bd04..51fb084391d4 100644 --- a/generators/server/templates/gradle/profile_dev.gradle.ejs +++ b/generators/server/templates/gradle/profile_dev.gradle.ejs @@ -41,7 +41,7 @@ configurations { } dependencies { - compileOnly "org.springframework.boot:spring-boot-devtools" + developmentOnly "org.springframework.boot:spring-boot-devtools" <%_ if (devDatabaseTypeH2Any && !reactive) { _%> implementation "com.h2database:h2" <%_ } _%> diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index f2dc84abc5e9..80024d25b300 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -23,6 +23,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + <%- javaDependencies['spring-boot'] %> + + + <%= packageName %> <%= dasherizedBaseName %> <%= projectVersion %> diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts index 7fc7e68128d9..96ec6d9afb35 100644 --- a/generators/spring-boot/generator.ts +++ b/generators/spring-boot/generator.ts @@ -411,14 +411,7 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) { const { serviceDiscoveryAny } = application as any; source.addJavaDependencies?.([ - { - groupId: 'tech.jhipster', - artifactId: 'jhipster-dependencies', - version: application.jhipsterDependenciesVersion!, - type: 'pom', - scope: 'import', - }, - { groupId: 'tech.jhipster', artifactId: 'jhipster-framework' }, + { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', version: jhipsterDependenciesVersion! }, ]); if (applicationTypeGateway || applicationTypeMicroservice || serviceDiscoveryAny || messageBrokerAny) { @@ -435,7 +428,9 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) { }, addSpringdoc({ application, source }) { const springdocDependency = `springdoc-openapi-starter-${application.reactive ? 'webflux' : 'webmvc'}-api`; - source.addJavaDependencies?.([{ groupId: 'org.springdoc', artifactId: springdocDependency }]); + source.addJavaDependencies?.([ + { groupId: 'org.springdoc', artifactId: springdocDependency, version: application.javaDependencies!.springdoc }, + ]); }, addFeignReactor({ application, source }) { const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, reactive } = application; @@ -483,6 +478,12 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) { version: application.javaDependencies!['spring-boot'], addToBuild: true, }, + { + pluginName: 'spring-dependency-management', + id: 'io.spring.dependency-management', + version: application.javaDependencies!['spring-dependency-management'], + addToBuild: true, + }, ]); } }, From dbaee9b942cc93a9208f2055fc3915ac22ade9b8 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 22 Mar 2024 09:11:05 -0300 Subject: [PATCH 5/5] drop spring-boot.version --- generators/server/templates/pom.xml.ejs | 2 -- 1 file changed, 2 deletions(-) diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 80024d25b300..5daa8d478538 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -105,7 +105,6 @@ <%- javaDependencies['properties-maven-plugin'] %> <%- javaDependencies['sonar-maven-plugin'] %> <%- javaDependencies['spotless-maven-plugin'] %> - <%- javaDependencies['spring-boot'] %> @@ -819,7 +818,6 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot.version}