From d7687f890e3ee432229b53fdf5b49bc74f8502ff Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 08:57:17 -0300 Subject: [PATCH 01/41] drop netty constant --- generators/constants.cjs | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index f8088394..7e4458b3 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -50,7 +50,6 @@ module.exports = { }, }, versions: { - netty: '4.1.107.Final', rxJava3: '2.3.0', hibernate: '6.4.4.Final', prometheusSimpleclient: '0.16.0', From 2145c17d0f735e5495b44d86c48076c20053c424 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:10:43 -0300 Subject: [PATCH 02/41] gradle.properties.ejs adjusts --- generators/micronaut/templates/gradle.properties.ejs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index 12d7ac08..c6bd2239 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -30,8 +30,8 @@ micronautVersion=<%= javaDependencies['micronaut-platform'] %> # The hibernate version should match the one managed by Micronaut data # https://mvnrepository.com/artifact/io.micronaut.data/micronaut-data-hibernate-jpa/1.0.1 hibernate_version=<%=versions.hibernate%> -mapstruct_version=<%=versions.mapstruct%> -archunit_junit5_version=<%=versions.archunit%> +mapstruct_version=<%=javaDependencies.mapstruct%> +archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %> logback_version=<%=versions.logback%> swagger_annotations_version=<%=versions.swaggerAnnotations%> mockito_version=<%=versions.mockito%> @@ -40,7 +40,6 @@ jbcrypt_version=<%=versions.jbcrypt%> <%_ } _%> jakarta_inject_version=<%= versions.jakartaInject %> jakarta_mail_version=<%=versions.jakartaMail%> -simplejavamail_version=<%= versions.simplejavamail %> problem_version=<%=versions.problem%> <%_ if (searchEngine === 'elasticsearch') { _%> log4j2_mock_version=0.0.2 @@ -71,9 +70,6 @@ openapi_plugin_version=4.3.1 <%_ } _%> shadow_plugin_version=7.1.2 -#rxjava3 dependencies -rxJava3Version=<%=versions.rxJava3%> - # jhipster-needle-gradle-property - JHipster will add additional properties here ## below are some of the gradle performance improvement settings that can be used as required, these are not enabled by default From 1c09d6ef4bda60b802195766b8b73dfa7f0f4edd Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:11:29 -0300 Subject: [PATCH 03/41] drop rxJava3Version usage from build.gradle.ejs --- generators/micronaut/templates/build.gradle.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index 2cf64c8d..54648dbe 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -424,7 +424,7 @@ dependencies { <%_ } _%> implementation("io.micronaut.rxjava3:micronaut-rxjava3") - implementation("io.micronaut.rxjava3:micronaut-rxjava3-http-client:$rxJava3Version") + implementation("io.micronaut.rxjava3:micronaut-rxjava3-http-client") // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here } From f8197074e5f1fd6cb6a5a0d3ded56d39548eecb1 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:16:45 -0300 Subject: [PATCH 04/41] drop javassist.version from pom.xml --- generators/micronaut/templates/pom.xml.ejs | 3 --- 1 file changed, 3 deletions(-) diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index a82a3ac5..6bfff5da 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -86,9 +86,6 @@ _%> <%= javaDependencies['micronaut-platform'] %> <%= versions.prometheusSimpleclient %> <%= versions.hibernate %> - - <%= versions.javassist %> <%= versions.jakartaInject %> <%= versions.jakartaMail %> <%_ if (!skipUserManagement) { _%> From 9812acbcc9f16f8ef2b702b580e06827a4b6e03a Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:17:46 -0300 Subject: [PATCH 05/41] cleanup dependencies. --- generators/constants.cjs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index 7e4458b3..a490e484 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -50,21 +50,15 @@ module.exports = { }, }, versions: { - rxJava3: '2.3.0', hibernate: '6.4.4.Final', prometheusSimpleclient: '0.16.0', jackson: '2.15.2', - javassist: '3.27.0-GA', // Should match Hibernate deps - javaxMail: '2.0.1', jbcrypt: '0.4', logback: '1.5.3', - mapstruct: '1.5.5.Final', swaggerAnnotations: '2.2.19', mockito: '5.10.0', problem: '0.29.1', caffeine: '3.1.8', - archunit: '1.2.1', - simplejavamail: '8.6.3', testcontainers: '1.19.6', assertj: '3.25.3', }, From a790fed50b0cd574518e9f704cbb2af393637f9c Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:29:07 -0300 Subject: [PATCH 06/41] drop jackson constant --- generators/constants.cjs | 1 - generators/micronaut/templates/pom.xml.ejs | 1 - 2 files changed, 2 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index a490e484..d4fcb58f 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -52,7 +52,6 @@ module.exports = { versions: { hibernate: '6.4.4.Final', prometheusSimpleclient: '0.16.0', - jackson: '2.15.2', jbcrypt: '0.4', logback: '1.5.3', swaggerAnnotations: '2.2.19', diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index 6bfff5da..009c49a6 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -96,7 +96,6 @@ _%> <%= versions.mockito %> <%= versions.assertj %> <%= versions.problem %> - <%= versions.jackson %> <%_ if (cacheProvider === 'caffeine') { _%> <%= versions.caffeine %> 1.4.0 From fb8f299aa4ea85cbf2796fe61efce913ebef154d Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:32:01 -0300 Subject: [PATCH 07/41] move swagger-annotations to dependabot --- generators/constants.cjs | 1 - generators/micronaut/generator.js | 2 + .../resources/gradle/libs.versions.toml | 2 + .../resources/micronaut-platform.pom.xml | 785 ++++++++++++++++++ .../micronaut/templates/build.gradle.ejs | 1 - .../micronaut/templates/gradle.properties.ejs | 1 - generators/micronaut/templates/pom.xml.ejs | 5 - 7 files changed, 789 insertions(+), 8 deletions(-) create mode 100644 generators/micronaut/resources/micronaut-platform.pom.xml diff --git a/generators/constants.cjs b/generators/constants.cjs index d4fcb58f..465b12f1 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -54,7 +54,6 @@ module.exports = { prometheusSimpleclient: '0.16.0', jbcrypt: '0.4', logback: '1.5.3', - swaggerAnnotations: '2.2.19', mockito: '5.10.0', problem: '0.29.1', caffeine: '3.1.8', diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 75793988..32e35b2e 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -197,11 +197,13 @@ export default class extends BaseApplicationGenerator { { name: 'logstash-logback-encoder', version: javaDependencies['logstash-logback-encoder'] }, { name: 'jhipster-framework', version: application.jhipsterDependenciesVersion }, { name: 'commons-lang3', version: javaDependencies['commons-lang3'] }, + { name: 'swagger-annotations', version: javaDependencies['swagger-annotations'] }, ], dependencies: [ { groupId: 'net.logstash.logback', artifactId: 'logstash-logback-encoder', versionRef: 'logstash-logback-encoder' }, { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', versionRef: 'jhipster-framework' }, { groupId: 'org.apache.commons', artifactId: 'commons-lang3', versionRef: 'commons-lang3' }, + { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', versionRef: 'swagger-annotations'} ], }); if (application.buildToolMaven) { diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 618a74b6..3dfd4d59 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -17,5 +17,7 @@ micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', vers redisson = { module = 'org.redisson:redisson', version = '3.30.0' } +swagger-annotations = { module = 'io.swagger.core.v3:swagger-annotations', version = '2.2.19' } + [plugins] micronaut-application = { id = 'io.micronaut.application', version = '4.3.8' } diff --git a/generators/micronaut/resources/micronaut-platform.pom.xml b/generators/micronaut/resources/micronaut-platform.pom.xml new file mode 100644 index 00000000..e0e43b60 --- /dev/null +++ b/generators/micronaut/resources/micronaut-platform.pom.xml @@ -0,0 +1,785 @@ + + + + + + + + 4.0.0 + io.micronaut.platform + micronaut-platform + 4.4.2 + pom + Micronaut Platform + Bill-Of-Materials (BOM) and Gradle version catalogs for Micronaut + https://micronaut.io + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + cedricchampeau + Cedric Champeau + + + + scm:git@github.com:micronaut-projects/micronaut-platform.git + scm:git@github.com:micronaut-projects/micronaut-platform.git + scm:git@github.com:micronaut-projects/micronaut-platform.git + + + 3.2.1 + 2.86.0 + 5.20.0 + 5.3.1 + 3.25.3 + 1.12.691 + 2.24.10 + 3.11.4 + 1.1.5 + 1.2.3 + 4.57.0 + 3.1.0 + 1.2.22 + 6.0.2 + 4.11.1 + 3.1.8 + 23.03 + 2.12.0 + 1.4.0 + 4.17.0 + 2.0.3 + 1.1.5 + 1.2.0 + 3.10.8 + 8.13.0 + 1.3 + 10.10.0 + 2.3.32 + 1.23.0 + 2.36.1 + 1.128.0 + 2.41.0 + 0.3.0 + 1.3.1 + 1.1.0 + 24.0.1 + 23.1.3 + 22.3.0 + 2023-01-24T02-11-56-babda5f + 13.1.1 + 21.5 + 0.12.4 + 4.0.21 + 1.4.1 + 1.62.2 + 2.2.224 + 2.2 + 4.3.1 + 5.3.6 + 2.2.2.Final + 6.4.4.Final + 5.1.0 + 1.3.3 + 0.64.8 + 14.0.27.Final + 2.17.0 + 2.16.1 + 2.1.1 + 2.1.3 + 3.0.0 + 2.1.3 + 3.1.0 + 2.0.1 + 2.2.4 + 3.25.10 + 0.3.1 + 1.3.2 + 2.2 + 3.1.0 + 1.1.1 + 3.45.1 + 11.0.20 + 5.14.0 + 3.19.7 + 1.17.2 + 3.0.2 + 1.3.4 + 3.1.9 + 5.10.2 + 5.10.2 + 3.7.0 + 3.7.0 + 5.8.1 + 1.7.3 + 1.9.23 + 1.9.23-1.0.20 + 2.3.9 + 6.3.2.RELEASE + 4.26.0 + 2.23.1 + 1.4.14 + 1.5.3 + 1.18.32 + 5.2.5 + 3.3.3 + 0.10.1 + 0.18.0 + 4.2.25 + 1.1.1 + 1.2.4 + 1.12.4 + 5.1.0 + 2.4.0 + 4.5.0 + 5.4.0 + 4.3.0 + 6.4.0 + 1.1.0 + 4.0.0 + 1.3.0 + 4.4.8 + 2.3.0 + 4.7.0 + 4.3.0 + 4.3.0 + 1.4.0 + 5.4.0 + 2.5.0 + 7.2.0 + 5.5.0 + 4.3.0 + 4.3.0 + 4.4.1 + 4.3.0 + 4.3.0 + 4.4.0 + 3.4.0 + 4.3.0 + 5.4.0 + 4.3.0 + 6.1.0 + 6.3.0 + 1.3.0 + 5.5.0 + 2.4.0 + 5.3.0 + 5.3.0 + 3.3.0 + 5.3.0 + 4.3.0 + 6.5.0 + 2.4.0 + 6.8.0 + 1.0.0 + 4.0.0 + 4.0.0 + 5.3.0 + 4.4.2 + 3.3.0 + 3.3.0 + 2.3.0 + 5.4.0 + 4.4.0 + 3.3.0 + 6.4.0 + 4.3.0 + 2.3.0 + 3.3.0 + 4.7.0 + 2.9.0 + 2.9.0 + 4.7.0 + 4.3.0 + 5.6.0 + 5.6.0 + 2.5.1 + 4.3.0 + 2.5.1 + 2.3.0 + 6.5.2 + 4.5.0 + 5.2.2 + 08.01.02-MS-GA + 5.11.0 + 1.13.10 + 4.11.1 + 4.11.1 + 1.2.5 + 1.2.5 + 12.6.1.jre11 + 8.3.0 + 8.0.33 + 5.18.0 + 5.17.0 + 0.0.28.Final + 0.0.25.Final + 2.0.65.Final + 4.1.108.Final + 0.10.0 + 9.37.3 + 21.13.0.0 + 2.1 + 2.9.1 + 2.12.0 + 2.0.1 + 1.36.0-alpha + 1.34.0-alpha + 1.34.0 + 0.27.0-alpha + 1.33.1-alpha + 1.33.1 + 1.36.0 + 1.4.1 + 1.6.0 + 4.7.5 + 42.7.3 + 1.11.1 + 3.25.3 + 2.2.0 + 3.2.2 + 1.0.0.RELEASE + 1.1.2 + 1.1.4 + 1.0.2.RELEASE + 0.8.2.RELEASE + 1.2.0 + 1.0.1.RELEASE + 1.0.4.RELEASE + 1.0.0.RELEASE + 1.0.4 + 2023.0.4 + 3.5.11 + 5.4.0 + 1.4.0 + 2.2.21 + 3.1.8 + 4.10.2 + 6.0.0 + 2.0.12 + 2.2 + 2023-09-13 + 2.3-groovy-4.0 + 4.8.4 + 3.2.4 + 6.1.5 + 2.2.21 + 1.6.4 + 1.19.7 + 3.1.2.RELEASE + 10.1.20 + 3.0.2 + 2.3 + 4.5.7 + 0.27.1 + 3.3.0 + + + + + org.graalvm.nativeimage + svm + ${graal.svm.version} + + + org.graalvm.sdk + graal-sdk + ${graal.sdk.version} + + + javax.annotation + javax.annotation-api + ${javax.annotation.api.version} + + + net.java.dev.jna + jna + ${jna.version} + + + com.google.code.findbugs + jsr305 + ${jsr305.version} + + + org.projectlombok + lombok + ${lombok.version} + + + org.spockframework + spock-core + ${spock.version} + + + com.github.spotbugs + spotbugs-annotations + ${spotbugs.version} + + + io.micronaut.platform + micronaut-parent + ${micronaut.platform.version} + + + org.junit + junit-bom + ${junit5.version} + pom + import + + + io.micronaut.acme + micronaut-acme-bom + ${micronaut.acme.version} + pom + import + + + io.micronaut.aot + micronaut-aot-bom + ${micronaut.aot.version} + pom + import + + + io.micronaut.aws + micronaut-aws-bom + ${micronaut.aws.version} + pom + import + + + io.micronaut.azure + micronaut-azure-bom + ${micronaut.azure.version} + pom + import + + + io.micronaut.cache + micronaut-cache-bom + ${micronaut.cache.version} + pom + import + + + io.micronaut.cassandra + micronaut-cassandra-bom + ${micronaut.cassandra.version} + pom + import + + + io.micronaut.chatbots + micronaut-chatbots-bom + ${micronaut.chatbots.version} + pom + import + + + io.micronaut.coherence + micronaut-coherence-bom + ${micronaut.coherence.version} + pom + import + + + io.micronaut.controlpanel + micronaut-control-panel-bom + ${micronaut.control.panel.version} + pom + import + + + io.micronaut + micronaut-core-bom + ${micronaut.core.version} + pom + import + + + io.micronaut.crac + micronaut-crac-bom + ${micronaut.crac.version} + pom + import + + + io.micronaut.data + micronaut-data-bom + ${micronaut.data.version} + pom + import + + + io.micronaut.discovery + micronaut-discovery-client-bom + ${micronaut.discovery.version} + pom + import + + + io.micronaut.eclipsestore + micronaut-eclipsestore-bom + ${micronaut.eclipsestore.version} + pom + import + + + io.micronaut.elasticsearch + micronaut-elasticsearch-bom + ${micronaut.elasticsearch.version} + pom + import + + + io.micronaut.email + micronaut-email-bom + ${micronaut.email.version} + pom + import + + + io.micronaut.flyway + micronaut-flyway-bom + ${micronaut.flyway.version} + pom + import + + + io.micronaut.gcp + micronaut-gcp-bom + ${micronaut.gcp.version} + pom + import + + + io.micronaut.graphql + micronaut-graphql-bom + ${micronaut.graphql.version} + pom + import + + + io.micronaut.groovy + micronaut-groovy-bom + ${micronaut.groovy.version} + pom + import + + + io.micronaut.grpc + micronaut-grpc-bom + ${micronaut.grpc.version} + pom + import + + + io.micronaut.beanvalidation + micronaut-hibernate-validator-bom + ${micronaut.hibernate.validator.version} + pom + import + + + io.micronaut.xml + micronaut-jackson-xml-bom + ${micronaut.jackson.xml.version} + pom + import + + + io.micronaut.jaxrs + micronaut-jaxrs-bom + ${micronaut.jaxrs.version} + pom + import + + + io.micronaut.jms + micronaut-jms-bom + ${micronaut.jms.version} + pom + import + + + io.micronaut.jmx + micronaut-jmx-bom + ${micronaut.jmx.version} + pom + import + + + io.micronaut.kafka + micronaut-kafka-bom + ${micronaut.kafka.version} + pom + import + + + io.micronaut.kotlin + micronaut-kotlin-bom + ${micronaut.kotlin.version} + pom + import + + + io.micronaut.kubernetes + micronaut-kubernetes-bom + ${micronaut.kubernetes.version} + pom + import + + + io.micronaut.liquibase + micronaut-liquibase-bom + ${micronaut.liquibase.version} + pom + import + + + io.micronaut.logging + micronaut-logging-bom + ${micronaut.logging.version} + pom + import + + + io.micronaut.micrometer + micronaut-micrometer-bom + ${micronaut.micrometer.version} + pom + import + + + io.micronaut.microstream + micronaut-microstream-bom + ${micronaut.microstream.version} + pom + import + + + io.micronaut.mongodb + micronaut-mongo-bom + ${micronaut.mongo.version} + pom + import + + + io.micronaut.mqtt + micronaut-mqtt-bom + ${micronaut.mqtt.version} + pom + import + + + io.micronaut.multitenancy + micronaut-multitenancy-bom + ${micronaut.multitenancy.version} + pom + import + + + io.micronaut.nats + micronaut-nats-bom + ${micronaut.nats.version} + pom + import + + + io.micronaut.neo4j + micronaut-neo4j-bom + ${micronaut.neo4j.version} + pom + import + + + io.micronaut.objectstorage + micronaut-object-storage-bom + ${micronaut.object.storage.version} + pom + import + + + io.micronaut.openapi + micronaut-openapi-bom + ${micronaut.openapi.version} + pom + import + + + io.micronaut.opensearch + micronaut-opensearch-bom + ${micronaut.opensearch.version} + pom + import + + + io.micronaut.oraclecloud + micronaut-oraclecloud-bom + ${micronaut.oraclecloud.version} + pom + import + + + io.micronaut.picocli + micronaut-picocli-bom + ${micronaut.picocli.version} + pom + import + + + io.micronaut.problem + micronaut-problem-json-bom + ${micronaut.problem.version} + pom + import + + + io.micronaut.pulsar + micronaut-pulsar-bom + ${micronaut.pulsar.version} + pom + import + + + io.micronaut.r2dbc + micronaut-r2dbc-bom + ${micronaut.r2dbc.version} + pom + import + + + io.micronaut.rabbitmq + micronaut-rabbitmq-bom + ${micronaut.rabbitmq.version} + pom + import + + + io.micronaut.reactor + micronaut-reactor-bom + ${micronaut.reactor.version} + pom + import + + + io.micronaut.redis + micronaut-redis-bom + ${micronaut.redis.version} + pom + import + + + io.micronaut.rss + micronaut-rss-bom + ${micronaut.rss.version} + pom + import + + + io.micronaut.rxjava2 + micronaut-rxjava2-bom + ${micronaut.rxjava2.version} + pom + import + + + io.micronaut.rxjava3 + micronaut-rxjava3-bom + ${micronaut.rxjava3.version} + pom + import + + + io.micronaut.security + micronaut-security-bom + ${micronaut.security.version} + pom + import + + + io.micronaut.serde + micronaut-serde-bom + ${micronaut.serialization.version} + pom + import + + + io.micronaut.servlet + micronaut-servlet-bom + ${micronaut.servlet.version} + pom + import + + + io.micronaut.session + micronaut-session-bom + ${micronaut.session.version} + pom + import + + + io.micronaut.spring + micronaut-spring-bom + ${micronaut.spring.version} + pom + import + + + io.micronaut.sql + micronaut-sql-bom + ${micronaut.sql.version} + pom + import + + + io.micronaut.test + micronaut-test-bom + ${micronaut.test.version} + pom + import + + + io.micronaut.testresources + micronaut-test-resources-bom + ${micronaut.test.resources.version} + pom + import + + + io.micronaut.toml + micronaut-toml-bom + ${micronaut.toml.version} + pom + import + + + io.micronaut.tracing + micronaut-tracing-bom + ${micronaut.tracing.version} + pom + import + + + io.micronaut.validation + micronaut-validation-bom + ${micronaut.validation.version} + pom + import + + + io.micronaut.views + micronaut-views-bom + ${micronaut.views.version} + pom + import + + + + diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index 54648dbe..05925007 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -218,7 +218,6 @@ dependencies { annotationProcessor "io.micronaut.openapi:micronaut-openapi" implementation "ch.qos.logback:logback-classic:$logback_version" - implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version" implementation "io.micrometer:micrometer-registry-prometheus" implementation "com.fasterxml.jackson.core:jackson-annotations" diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index c6bd2239..22687046 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -33,7 +33,6 @@ hibernate_version=<%=versions.hibernate%> mapstruct_version=<%=javaDependencies.mapstruct%> archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %> logback_version=<%=versions.logback%> -swagger_annotations_version=<%=versions.swaggerAnnotations%> mockito_version=<%=versions.mockito%> <%_ if (!skipUserManagement) { _%> jbcrypt_version=<%=versions.jbcrypt%> diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index 009c49a6..9e87621d 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -135,11 +135,6 @@ _%> - - io.swagger.core.v3 - swagger-annotations - <%= versions.swaggerAnnotations %> - org.yaml snakeyaml From b5fe0904676ae11bc5af7a47fce2ba6df9ab96a2 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:34:06 -0300 Subject: [PATCH 08/41] drop prometheusSimpleclient constant --- generators/constants.cjs | 1 - generators/micronaut/templates/pom.xml.ejs | 1 - 2 files changed, 2 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index 465b12f1..94315eeb 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -51,7 +51,6 @@ module.exports = { }, versions: { hibernate: '6.4.4.Final', - prometheusSimpleclient: '0.16.0', jbcrypt: '0.4', logback: '1.5.3', mockito: '5.10.0', diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index 9e87621d..72baaad2 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -84,7 +84,6 @@ _%> <%= javaDependencies['micronaut-platform'] %> - <%= versions.prometheusSimpleclient %> <%= versions.hibernate %> <%= versions.jakartaInject %> <%= versions.jakartaMail %> From 61bdbb88515a891bd89e1bbf98cc5f9f507bd4fd Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:38:30 -0300 Subject: [PATCH 09/41] move mockito-core to dependabot --- generators/constants.cjs | 1 - generators/micronaut/generator.js | 3 ++- generators/micronaut/resources/gradle/libs.versions.toml | 2 ++ generators/micronaut/templates/build.gradle.ejs | 1 - generators/micronaut/templates/gradle.properties.ejs | 1 - generators/micronaut/templates/pom.xml.ejs | 7 ------- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index 94315eeb..aa83fc40 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -53,7 +53,6 @@ module.exports = { hibernate: '6.4.4.Final', jbcrypt: '0.4', logback: '1.5.3', - mockito: '5.10.0', problem: '0.29.1', caffeine: '3.1.8', testcontainers: '1.19.6', diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 32e35b2e..d3525023 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -203,7 +203,8 @@ export default class extends BaseApplicationGenerator { { groupId: 'net.logstash.logback', artifactId: 'logstash-logback-encoder', versionRef: 'logstash-logback-encoder' }, { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', versionRef: 'jhipster-framework' }, { groupId: 'org.apache.commons', artifactId: 'commons-lang3', versionRef: 'commons-lang3' }, - { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', versionRef: 'swagger-annotations'} + { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', versionRef: 'swagger-annotations'}, + { groupId: 'org.mockito', artifactId: 'mockito-core', version: javaDependencies['mockito-core'], scope: 'test' }, ], }); if (application.buildToolMaven) { diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 3dfd4d59..3a0fb9ba 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -15,6 +15,8 @@ logstash-logback-encoder = { module = 'net.logstash.logback:logstash-logback-enc micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', version = '4.4.2' } +mockito-core = { module = 'org.mockito:mockito-core', version = '5.10.0' } + redisson = { module = 'org.redisson:redisson', version = '3.30.0' } swagger-annotations = { module = 'io.swagger.core.v3:swagger-annotations', version = '2.2.19' } diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index 05925007..801ef907 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -402,7 +402,6 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-engine" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.assertj:assertj-core" - testImplementation "org.mockito:mockito-core:$mockito_version" testImplementation "com.tngtech.archunit:archunit-junit5-api:${archunit_junit5_version}" testRuntimeOnly "com.tngtech.archunit:archunit-junit5-engine:${archunit_junit5_version}" diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index 22687046..40ab3b31 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -33,7 +33,6 @@ hibernate_version=<%=versions.hibernate%> mapstruct_version=<%=javaDependencies.mapstruct%> archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %> logback_version=<%=versions.logback%> -mockito_version=<%=versions.mockito%> <%_ if (!skipUserManagement) { _%> jbcrypt_version=<%=versions.jbcrypt%> <%_ } _%> diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index 72baaad2..f31926ae 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -92,7 +92,6 @@ _%> <%_ } _%> <%= versions.logback %> <%- javaDependencies.mapstruct %> - <%= versions.mockito %> <%= versions.assertj %> <%= versions.problem %> <%_ if (cacheProvider === 'caffeine') { _%> @@ -352,12 +351,6 @@ _%> ${archunit-junit5.version} test - - org.mockito - mockito-core - ${mockito.version} - test - org.assertj assertj-core From d90b93320c6c1f0fff005d147a316b9bc66e2f19 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:41:21 -0300 Subject: [PATCH 10/41] drop assertj constant --- generators/constants.cjs | 1 - generators/micronaut/templates/pom.xml.ejs | 2 -- 2 files changed, 3 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index aa83fc40..540ed72e 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -56,6 +56,5 @@ module.exports = { problem: '0.29.1', caffeine: '3.1.8', testcontainers: '1.19.6', - assertj: '3.25.3', }, }; diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index f31926ae..c0d9bd24 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -92,7 +92,6 @@ _%> <%_ } _%> <%= versions.logback %> <%- javaDependencies.mapstruct %> - <%= versions.assertj %> <%= versions.problem %> <%_ if (cacheProvider === 'caffeine') { _%> <%= versions.caffeine %> @@ -354,7 +353,6 @@ _%> org.assertj assertj-core - ${assertj.version} test From 89acb313d95b474b9b0cff402e25e8d50695dfd2 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:47:04 -0300 Subject: [PATCH 11/41] drop jbcrypt from constants --- generators/constants.cjs | 1 - generators/micronaut/generator.js | 9 ++++++++- .../micronaut/resources/gradle/libs.versions.toml | 2 ++ generators/micronaut/templates/build.gradle.ejs | 4 ---- generators/micronaut/templates/gradle.properties.ejs | 3 --- generators/micronaut/templates/pom.xml.ejs | 10 ---------- 6 files changed, 10 insertions(+), 19 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index 540ed72e..93507316 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -51,7 +51,6 @@ module.exports = { }, versions: { hibernate: '6.4.4.Final', - jbcrypt: '0.4', logback: '1.5.3', problem: '0.29.1', caffeine: '3.1.8', diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index d3525023..53dad6e8 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -203,7 +203,7 @@ export default class extends BaseApplicationGenerator { { groupId: 'net.logstash.logback', artifactId: 'logstash-logback-encoder', versionRef: 'logstash-logback-encoder' }, { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', versionRef: 'jhipster-framework' }, { groupId: 'org.apache.commons', artifactId: 'commons-lang3', versionRef: 'commons-lang3' }, - { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', versionRef: 'swagger-annotations'}, + { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', versionRef: 'swagger-annotations' }, { groupId: 'org.mockito', artifactId: 'mockito-core', version: javaDependencies['mockito-core'], scope: 'test' }, ], }); @@ -219,6 +219,13 @@ export default class extends BaseApplicationGenerator { addToBuild: true, }); } + + if (!application.skipUserManagement) { + source.addJavaDefinition({ + versions: [{ name: 'jbcrypt', version: javaDependencies.jbcrypt }], + dependencies: [{ groupId: 'org.mindrot', artifactId: 'jbcrypt', versionRef: 'jbcrypt' }], + }); + } }, sqlDependencies({ application, source }) { if (application.databaseTypeSql) { diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 3a0fb9ba..8c70f94d 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -21,5 +21,7 @@ redisson = { module = 'org.redisson:redisson', version = '3.30.0' } swagger-annotations = { module = 'io.swagger.core.v3:swagger-annotations', version = '2.2.19' } +jbcrypt = { module = 'org.mindrot:jbcrypt', version = '0.4' } + [plugins] micronaut-application = { id = 'io.micronaut.application', version = '4.3.8' } diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index 801ef907..9a77af11 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -306,10 +306,6 @@ dependencies { <%_ } _%> implementation "io.micronaut.views:micronaut-views-thymeleaf" -<%_ if (!skipUserManagement) { _%> - implementation "org.mindrot:jbcrypt:$jbcrypt_version" -<%_ } _%> - compileOnly "org.graalvm.nativeimage:svm" implementation "io.micronaut.validation:micronaut-validation" diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index 40ab3b31..b302d684 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -33,9 +33,6 @@ hibernate_version=<%=versions.hibernate%> mapstruct_version=<%=javaDependencies.mapstruct%> archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %> logback_version=<%=versions.logback%> -<%_ if (!skipUserManagement) { _%> -jbcrypt_version=<%=versions.jbcrypt%> -<%_ } _%> jakarta_inject_version=<%= versions.jakartaInject %> jakarta_mail_version=<%=versions.jakartaMail%> problem_version=<%=versions.problem%> diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index c0d9bd24..f966f860 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -87,9 +87,6 @@ _%> <%= versions.hibernate %> <%= versions.jakartaInject %> <%= versions.jakartaMail %> - <%_ if (!skipUserManagement) { _%> - <%= versions.jbcrypt %> - <%_ } _%> <%= versions.logback %> <%- javaDependencies.mapstruct %> <%= versions.problem %> @@ -382,13 +379,6 @@ _%> compile <%_ } _%> - <%_ if (!skipUserManagement) { _%> - - org.mindrot - jbcrypt - ${jbcrypt.version} - - <%_ } _%> <%_ if (applicationTypeMicroservice) { _%> <%_ } _%> From e8057122e78aaeb08f72096722e83589441bb538 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:52:22 -0300 Subject: [PATCH 12/41] adjusts --- generators/micronaut/generator.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 53dad6e8..d7f8a78b 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -193,17 +193,15 @@ export default class extends BaseApplicationGenerator { addMicronautDependencies({ application, source }) { const { javaDependencies } = application; source.addJavaDefinition({ - versions: [ - { name: 'logstash-logback-encoder', version: javaDependencies['logstash-logback-encoder'] }, - { name: 'jhipster-framework', version: application.jhipsterDependenciesVersion }, - { name: 'commons-lang3', version: javaDependencies['commons-lang3'] }, - { name: 'swagger-annotations', version: javaDependencies['swagger-annotations'] }, - ], dependencies: [ - { groupId: 'net.logstash.logback', artifactId: 'logstash-logback-encoder', versionRef: 'logstash-logback-encoder' }, - { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', versionRef: 'jhipster-framework' }, - { groupId: 'org.apache.commons', artifactId: 'commons-lang3', versionRef: 'commons-lang3' }, - { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', versionRef: 'swagger-annotations' }, + { + groupId: 'net.logstash.logback', + artifactId: 'logstash-logback-encoder', + version: javaDependencies['logstash-logback-encoder'], + }, + { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', version: application.jhipsterDependenciesVersion }, + { groupId: 'org.apache.commons', artifactId: 'commons-lang3', version: javaDependencies['commons-lang3'] }, + { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', version: javaDependencies['swagger-annotations'] }, { groupId: 'org.mockito', artifactId: 'mockito-core', version: javaDependencies['mockito-core'], scope: 'test' }, ], }); From cc725806c739ba29e3c70f8c9eecf381e9e7130e Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 09:54:49 -0300 Subject: [PATCH 13/41] remove non used variables --- generators/micronaut/templates/gradle.properties.ejs | 2 -- generators/micronaut/templates/pom.xml.ejs | 2 -- 2 files changed, 4 deletions(-) diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index b302d684..c967ae4f 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -33,8 +33,6 @@ hibernate_version=<%=versions.hibernate%> mapstruct_version=<%=javaDependencies.mapstruct%> archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %> logback_version=<%=versions.logback%> -jakarta_inject_version=<%= versions.jakartaInject %> -jakarta_mail_version=<%=versions.jakartaMail%> problem_version=<%=versions.problem%> <%_ if (searchEngine === 'elasticsearch') { _%> log4j2_mock_version=0.0.2 diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index f966f860..b5db3584 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -85,8 +85,6 @@ _%> <%= javaDependencies['micronaut-platform'] %> <%= versions.hibernate %> - <%= versions.jakartaInject %> - <%= versions.jakartaMail %> <%= versions.logback %> <%- javaDependencies.mapstruct %> <%= versions.problem %> From f08c8952de88bedabad73e7342c8b44419b78289 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 10:01:23 -0300 Subject: [PATCH 14/41] move zalando to dependabot --- generators/constants.cjs | 1 - generators/micronaut/generator.js | 2 ++ .../micronaut/resources/gradle/libs.versions.toml | 4 ++++ generators/micronaut/templates/build.gradle.ejs | 3 --- generators/micronaut/templates/gradle.properties.ejs | 1 - generators/micronaut/templates/pom.xml.ejs | 11 ----------- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index 93507316..aa0e26fd 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -52,7 +52,6 @@ module.exports = { versions: { hibernate: '6.4.4.Final', logback: '1.5.3', - problem: '0.29.1', caffeine: '3.1.8', testcontainers: '1.19.6', }, diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index d7f8a78b..2c7bb4ab 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -203,6 +203,8 @@ export default class extends BaseApplicationGenerator { { groupId: 'org.apache.commons', artifactId: 'commons-lang3', version: javaDependencies['commons-lang3'] }, { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', version: javaDependencies['swagger-annotations'] }, { groupId: 'org.mockito', artifactId: 'mockito-core', version: javaDependencies['mockito-core'], scope: 'test' }, + { groupId: 'org.zalando', artifactId: 'jackson-datatype-problem', version: javaDependencies['jackson-datatype-problem'] }, + { groupId: 'org.zalando', artifactId: 'problem-violations', version: javaDependencies['problem-violations'] }, ], }); if (application.buildToolMaven) { diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 8c70f94d..87e55d99 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -23,5 +23,9 @@ swagger-annotations = { module = 'io.swagger.core.v3:swagger-annotations', versi jbcrypt = { module = 'org.mindrot:jbcrypt', version = '0.4' } +problem-violations = { module = 'org.zalando:problem-violations', version = '0.29.1' } + +jackson-datatype-problem = { module = 'org.zalando:jackson-datatype-problem', version = '0.27.1' } + [plugins] micronaut-application = { id = 'io.micronaut.application', version = '4.3.8' } diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index 9a77af11..fbb877c0 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -330,9 +330,6 @@ dependencies { runtimeOnly("org.eclipse.angus:angus-mail") implementation("io.micronaut.email:micronaut-email-template") implementation("io.micronaut.views:micronaut-views-thymeleaf") - - implementation "org.zalando:problem-violations:$problem_version" - implementation "org.zalando:jackson-datatype-problem:0.27.1" <%_ if (searchEngine === 'elasticsearch') { _%> // log4j2-mock needed to create embedded elasticsearch instance with SLF4J diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index c967ae4f..bba6f302 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -33,7 +33,6 @@ hibernate_version=<%=versions.hibernate%> mapstruct_version=<%=javaDependencies.mapstruct%> archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %> logback_version=<%=versions.logback%> -problem_version=<%=versions.problem%> <%_ if (searchEngine === 'elasticsearch') { _%> log4j2_mock_version=0.0.2 <%_ } _%> diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index b5db3584..583a28a2 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -87,7 +87,6 @@ _%> <%= versions.hibernate %> <%= versions.logback %> <%- javaDependencies.mapstruct %> - <%= versions.problem %> <%_ if (cacheProvider === 'caffeine') { _%> <%= versions.caffeine %> 1.4.0 @@ -163,16 +162,6 @@ _%> logback-core ${logback.version} - - org.zalando - jackson-datatype-problem - 0.27.1 - - - org.zalando - problem-violations - <%=versions.problem%> - io.micronaut.validation micronaut-validation From c1965f66d4132f131c40d961dab6d99f22b2878b Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 10:06:00 -0300 Subject: [PATCH 15/41] cleanup caffeine constants --- generators/constants.cjs | 1 - generators/micronaut/templates/build.gradle.ejs | 5 +---- generators/micronaut/templates/gradle.properties.ejs | 4 ---- generators/micronaut/templates/pom.xml.ejs | 4 ---- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index aa0e26fd..c7220f59 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -52,7 +52,6 @@ module.exports = { versions: { hibernate: '6.4.4.Final', logback: '1.5.3', - caffeine: '3.1.8', testcontainers: '1.19.6', }, }; diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index fbb877c0..594ea717 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -286,12 +286,9 @@ dependencies { <%_ } _%> <%_ } _%> <%_ if (cacheProvider === 'caffeine') { _%> - implementation "com.github.ben-manes.caffeine:caffeine:${caffeine_version}" - implementation "com.github.ben-manes.caffeine:jcache:${caffeine_version}" - implementation "com.typesafe:config:${typesafe_config_version}" implementation "io.micronaut.cache:micronaut-cache-caffeine" <%_ if (enableHibernateCache) { _%> - implementation "org.hibernate:hibernate-jcache:$hibernate_version" + implementation "org.hibernate:hibernate-jcache" <%_ } _%> <%_ } _%> diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index bba6f302..3f67b6a1 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -39,10 +39,6 @@ log4j2_mock_version=0.0.2 <%_ if (enableSwaggerCodegen) { _%> jackson_databind_nullable_version=<%= javaDependencies['jackson-databind-nullable'] %> <%_ } _%> -<%_ if (cacheProvider === 'caffeine') { _%> -caffeine_version=<%=versions.caffeine%> -typesafe_config_version=1.4.0 -<%_ } _%> testcontainers_version=<%= versions.testcontainers %> liquibaseTaskPrefix=liquibase diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index 583a28a2..b7e6e291 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -87,10 +87,6 @@ _%> <%= versions.hibernate %> <%= versions.logback %> <%- javaDependencies.mapstruct %> -<%_ if (cacheProvider === 'caffeine') { _%> - <%= versions.caffeine %> - 1.4.0 -<%_ } _%> <%_ if (cacheProviderEhcache) { _%> 3.10.8 <%_ } _%> From fbf3f51ce73cf97e47d45c9d4064b000fff436fd Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 10:07:46 -0300 Subject: [PATCH 16/41] jbcrypt adjusts --- generators/micronaut/generator.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 2c7bb4ab..ed41d747 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -222,8 +222,7 @@ export default class extends BaseApplicationGenerator { if (!application.skipUserManagement) { source.addJavaDefinition({ - versions: [{ name: 'jbcrypt', version: javaDependencies.jbcrypt }], - dependencies: [{ groupId: 'org.mindrot', artifactId: 'jbcrypt', versionRef: 'jbcrypt' }], + dependencies: [{ groupId: 'org.mindrot', artifactId: 'jbcrypt', version: javaDependencies.jbcrypt }], }); } }, From da62d371366586da6ac3f412a33b3b1802f54a24 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 10:09:44 -0300 Subject: [PATCH 17/41] drop testcontainers constant --- generators/constants.cjs | 1 - generators/micronaut/templates/build.gradle.ejs | 2 +- generators/micronaut/templates/gradle.properties.ejs | 2 -- generators/micronaut/templates/pom.xml.ejs | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index c7220f59..ceef9097 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -52,6 +52,5 @@ module.exports = { versions: { hibernate: '6.4.4.Final', logback: '1.5.3', - testcontainers: '1.19.6', }, }; diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index 594ea717..181b6209 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -259,7 +259,7 @@ dependencies { <%_ if (enableHibernateCache) { _%> implementation "org.hibernate:hibernate-jcache:$hibernate_version" <%_ } _%> - testImplementation "org.testcontainers:testcontainers:$testcontainers_version" + testImplementation "org.testcontainers:testcontainers" <%_ } _%> <%_ if (['ehcache', 'caffeine', 'hazelcast', 'infinispan', 'redis'].includes(cacheProvider) || applicationTypeGateway) { _%> implementation "io.micronaut.cache:micronaut-cache-core" diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index 3f67b6a1..157be45e 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -39,8 +39,6 @@ log4j2_mock_version=0.0.2 <%_ if (enableSwaggerCodegen) { _%> jackson_databind_nullable_version=<%= javaDependencies['jackson-databind-nullable'] %> <%_ } _%> -testcontainers_version=<%= versions.testcontainers %> - liquibaseTaskPrefix=liquibase <%_ if (databaseTypeSql) { _%> diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index b7e6e291..b8e2fbc3 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -91,7 +91,6 @@ _%> 3.10.8 <%_ } _%> <%- javaDependencies['archunit-junit5'] %> - <%= versions.testcontainers %> <%- javaDependencies['maven-antrun-plugin'] %> <%- javaDependencies['maven-clean-plugin'] %> From ecf2c4c90338943223a98ebab28e12372ea8e1d6 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 10:35:43 -0300 Subject: [PATCH 18/41] cleanup pom.xml --- generators/micronaut/templates/pom.xml.ejs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index b8e2fbc3..92d15808 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -87,9 +87,6 @@ _%> <%= versions.hibernate %> <%= versions.logback %> <%- javaDependencies.mapstruct %> -<%_ if (cacheProviderEhcache) { _%> - 3.10.8 -<%_ } _%> <%- javaDependencies['archunit-junit5'] %> <%- javaDependencies['maven-antrun-plugin'] %> @@ -102,8 +99,6 @@ _%> <%- javaDependencies['maven-failsafe-plugin'] %> <%- javaDependencies['maven-resources-plugin'] %> <%- javaDependencies['maven-surefire-plugin'] %> - 3.5.1 - 3.1.1 <%- javaDependencies['git-commit-id-maven-plugin'] %> 1.0.0 <%- javaDependencies['properties-maven-plugin'] %> From 620a522e8314f915146c9f46cf6a9d4be053be71 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 10:35:59 -0300 Subject: [PATCH 19/41] cleanup build.gradle and gradle.properties --- generators/micronaut/templates/build.gradle.ejs | 6 ------ generators/micronaut/templates/gradle.properties.ejs | 7 ------- 2 files changed, 13 deletions(-) diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index 181b6209..6f2dd610 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -318,7 +318,6 @@ dependencies { implementation("io.micronaut.data:micronaut-data-jdbc") { exclude group: 'io.micronaut', module: 'micronaut-jdbc' } - implementation "jakarta.persistence:jakarta.persistence-api:3.1.0" <%_ if (serviceDiscoveryType === 'eureka' || serviceDiscoveryType === 'consul') { _%> implementation "io.micronaut.discovery:micronaut-discovery-client" <%_ } _%> @@ -327,11 +326,6 @@ dependencies { runtimeOnly("org.eclipse.angus:angus-mail") implementation("io.micronaut.email:micronaut-email-template") implementation("io.micronaut.views:micronaut-views-thymeleaf") - <%_ if (searchEngine === 'elasticsearch') { _%> - - // log4j2-mock needed to create embedded elasticsearch instance with SLF4J - runtimeOnly "de.dentrassi.elasticsearch:log4j2-mock:$log4j2_mock_version" - <%_ } _%> <%_ if (messageBroker === 'kafka') { _%> <%_ if (!reactive) { _%> implementation "org.apache.kafka:kafka-clients" diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index 157be45e..512477eb 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -33,9 +33,6 @@ hibernate_version=<%=versions.hibernate%> mapstruct_version=<%=javaDependencies.mapstruct%> archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %> logback_version=<%=versions.logback%> -<%_ if (searchEngine === 'elasticsearch') { _%> -log4j2_mock_version=0.0.2 -<%_ } _%> <%_ if (enableSwaggerCodegen) { _%> jackson_databind_nullable_version=<%= javaDependencies['jackson-databind-nullable'] %> <%_ } _%> @@ -47,10 +44,6 @@ jaxb_runtime_version=<%= javaDependencies['jaxb-runtime'] %> # gradle plugin version git_properties_plugin_version=2.4.1 -apt_plugin_version=0.21 -<%_ if (databaseTypeSql) { _%> -liquibase_plugin_version=2.2.0 -<%_ } _%> <%_ if (enableSwaggerCodegen) { _%> openapi_plugin_version=4.3.1 <%_ } _%> From c80fe826aa157d52a4d2f30a72860e62a50942bd Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 10:43:44 -0300 Subject: [PATCH 20/41] move gradle plugins to dependabot --- generators/micronaut/generator.js | 34 +++++++++++++++---- .../resources/gradle/libs.versions.toml | 6 ++++ .../micronaut/templates/gradle.properties.ejs | 7 ---- .../micronaut/templates/settings.gradle.ejs | 5 --- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index ed41d747..7e74bf72 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -212,12 +212,34 @@ export default class extends BaseApplicationGenerator { properties: [{ property: 'modernizer.failOnViolations', value: 'false' }], }); } else if (application.buildToolGradle) { - source.addGradleDependencyCatalogPlugin({ - id: 'io.micronaut.application', - pluginName: 'micronaut-application', - version: application.javaDependencies['micronaut-application'], - addToBuild: true, - }); + source.addGradleDependencyCatalogPlugins([ + { + id: 'io.micronaut.application', + pluginName: 'micronaut-application', + version: application.javaDependencies['micronaut-application'], + addToBuild: true, + }, + { + id: 'com.gorylenko.gradle-git-properties', + pluginName: 'gradle-git-properties', + version: application.javaDependencies['gradle-git-properties'], + addToBuild: true, + }, + { + id: 'com.github.johnrengelman.shadow', + pluginName: 'shadow', + version: application.javaDependencies['shadow'], + addToBuild: true, + }, + ]); + if (application.enableSwaggerCodegen) { + source.addGradleDependencyCatalogPlugin({ + id: 'org.openapi.generator', + pluginName: 'openapi-generator', + version: application.javaDependencies['openapi-generator'], + addToBuild: true, + }); + } } if (!application.skipUserManagement) { diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 87e55d99..8a05d7d4 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -29,3 +29,9 @@ jackson-datatype-problem = { module = 'org.zalando:jackson-datatype-problem', ve [plugins] micronaut-application = { id = 'io.micronaut.application', version = '4.3.8' } + +gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.1' } + +openapi-generator = { id = 'org.openapi.generator', version = '4.3.1' } + +shadow = { id = 'com.github.johnrengelman.shadow', version = '7.1.2' } diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index 512477eb..f2fc926a 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -42,13 +42,6 @@ liquibaseTaskPrefix=liquibase jaxb_runtime_version=<%= javaDependencies['jaxb-runtime'] %> <%_ } _%> -# gradle plugin version -git_properties_plugin_version=2.4.1 -<%_ if (enableSwaggerCodegen) { _%> -openapi_plugin_version=4.3.1 -<%_ } _%> -shadow_plugin_version=7.1.2 - # jhipster-needle-gradle-property - JHipster will add additional properties here ## below are some of the gradle performance improvement settings that can be used as required, these are not enabled by default diff --git a/generators/micronaut/templates/settings.gradle.ejs b/generators/micronaut/templates/settings.gradle.ejs index d94ad245..205b27be 100644 --- a/generators/micronaut/templates/settings.gradle.ejs +++ b/generators/micronaut/templates/settings.gradle.ejs @@ -24,11 +24,6 @@ pluginManagement { // jhipster-needle-gradle-plugin-management-repositories - JHipster will add additional entries here } plugins { - id 'com.gorylenko.gradle-git-properties' version "${git_properties_plugin_version}" - <%_ if (enableSwaggerCodegen) { _%> - id "org.openapi.generator" version "${openapi_plugin_version}" - <%_ } _%> - id 'com.github.johnrengelman.shadow' version "${shadow_plugin_version}" // jhipster-needle-gradle-plugin-management-plugins - JHipster will add additional entries here } } From 7f2b012ab65c75270d74e1a1a81a028fd8ad34a6 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 10:47:21 -0300 Subject: [PATCH 21/41] cleanup eclipse from pom.xml --- generators/micronaut/templates/pom.xml.ejs | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index 92d15808..3d3014c6 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -93,14 +93,13 @@ _%> <%- javaDependencies['maven-clean-plugin'] %> <%- javaDependencies['maven-compiler-plugin'] %> <%- javaDependencies['maven-javadoc-plugin'] %> - 2.10 <%- javaDependencies['maven-site-plugin'] %> <%- javaDependencies['maven-enforcer-plugin'] %> <%- javaDependencies['maven-failsafe-plugin'] %> <%- javaDependencies['maven-resources-plugin'] %> <%- javaDependencies['maven-surefire-plugin'] %> <%- javaDependencies['git-commit-id-maven-plugin'] %> - 1.0.0 + <%- javaDependencies['lifecycle-mapping'] %> <%- javaDependencies['properties-maven-plugin'] %> <%_ if (enableSwaggerCodegen) { _%> <%= javaDependencies['jackson-databind-nullable'] %> @@ -396,10 +395,6 @@ _%> org.apache.maven.plugins maven-javadoc-plugin - - org.apache.maven.plugins - maven-eclipse-plugin - org.apache.maven.plugins maven-enforcer-plugin @@ -557,15 +552,6 @@ _%> maven-site-plugin ${maven-site-plugin.version} - - org.apache.maven.plugins - maven-eclipse-plugin - ${maven-eclipse-plugin.version} - - true - true - - org.apache.maven.plugins maven-enforcer-plugin From d4308df797468340bbffafd1c681e4fd8f3027a3 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 10:53:57 -0300 Subject: [PATCH 22/41] add update micronaut-platform workflow --- .../update-micronaut-platform-pom.yml | 62 +++++++++++++++++++ ...latform.pom.xml => micronaut-platform.pom} | 0 2 files changed, 62 insertions(+) create mode 100644 .github/workflows/update-micronaut-platform-pom.yml rename generators/micronaut/resources/{micronaut-platform.pom.xml => micronaut-platform.pom} (100%) diff --git a/.github/workflows/update-micronaut-platform-pom.yml b/.github/workflows/update-micronaut-platform-pom.yml new file mode 100644 index 00000000..67b538f0 --- /dev/null +++ b/.github/workflows/update-micronaut-platform-pom.yml @@ -0,0 +1,62 @@ +# +# Copyright the original author or authors from the JHipster project. +# +# This file is part of the JHipster project, see https://www.jhipster.tech/ +# for more information. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +name: update micronaut-platform bom +on: + workflow_dispatch: + inputs: + micronautPlatformVersion: + description: 'Micronaut Platform version' + required: true + type: string + +permissions: + contents: read + +jobs: + build: + permissions: + contents: write # for peter-evans/create-pull-request to create branch + pull-requests: write # for peter-evans/create-pull-request to create a PR + name: update micronaut-platform bom + if: github.repository == 'jhipster/generator-jhipster' + runs-on: ubuntu-latest + steps: + - uses: actions/setup-node@v4 + with: + node-version: 20 + - uses: actions/checkout@v4 + - uses: jhipster/actions/setup-git@v0 + - uses: jhipster/actions/restore-cache@v0 + with: + npm: true + - name: Create commit + run: | + wget -O micronaut-platform.pom https://repo1.maven.org/maven2/io/micronaut/platform/micronaut-platform/${{ inputs.micronautPlatformVersion }}/micronaut-platform-${{ inputs.micronautPlatformVersion }}.pom + git add . + git commit -a -m "update micronaut-platform bom to v${{ inputs.micronautPlatformVersion }}" + working-directory: generators/micronaut/resources + - name: Create Pull Request + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: 'update micronaut-platform bom to v${{ inputs.micronautPlatformVersion }}' + title: 'update micronaut-platform bom to v${{ inputs.micronautPlatformVersion }}' + body: update micronaut-platform bom to v${{ inputs.micronautPlatformVersion }} + labels: 'theme: dependencies' diff --git a/generators/micronaut/resources/micronaut-platform.pom.xml b/generators/micronaut/resources/micronaut-platform.pom similarity index 100% rename from generators/micronaut/resources/micronaut-platform.pom.xml rename to generators/micronaut/resources/micronaut-platform.pom From 5123a14bb379b82a88d541689544d9444acd4ea7 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 11:03:46 -0300 Subject: [PATCH 23/41] use hibernate version from micronaut-platform pom. --- generators/constants.cjs | 1 - generators/micronaut/generator.js | 10 +++++++++- generators/micronaut/templates/gradle.properties.ejs | 4 +--- generators/micronaut/templates/pom.xml.ejs | 1 - 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index ceef9097..60703564 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -50,7 +50,6 @@ module.exports = { }, }, versions: { - hibernate: '6.4.4.Final', logback: '1.5.3', }, }; diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 7e74bf72..39ae53e4 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -4,6 +4,7 @@ import BaseApplicationGenerator from 'generator-jhipster/generators/server'; import { GENERATOR_DOCKER, GENERATOR_LANGUAGES, GENERATOR_LIQUIBASE, GENERATOR_SERVER } from 'generator-jhipster/generators'; import { createNeedleCallback, createBase64Secret } from 'generator-jhipster/generators/base/support'; import { addJavaAnnotation } from 'generator-jhipster/generators/java/support'; +import { parseMavenPom } from 'generator-jhipster/generators/maven/support'; import mnConstants from '../constants.cjs'; import { writeFiles } from './files.js'; @@ -109,6 +110,11 @@ export default class extends BaseApplicationGenerator { async loading({ application }) { await this.loadCurrentJHipsterCommandConfig(application); }, + loadMicronautPlatformPom({ application }) { + const pomFile = this.readTemplate(this.templatePath('../resources/micronaut-platform.pom')).toString(); + const pom = parseMavenPom(pomFile); + Object.assign(application.javaManagedProperties, pom.project.properties); + }, }); } @@ -250,7 +256,9 @@ export default class extends BaseApplicationGenerator { }, sqlDependencies({ application, source }) { if (application.databaseTypeSql) { - source.addMavenDefinition?.(getImperativeMavenDefinition({ javaDependencies: { hibernate: constants.versions.hibernate } })); + source.addMavenDefinition?.( + getImperativeMavenDefinition({ javaDependencies: { hibernate: application.javaManagedProperties['hibernate.version'] } }), + ); source.addMavenDefinition?.(getCommonMavenDefinition()); source.addMavenDependency?.(getDatabaseDriverForDatabase(application.prodDatabaseType).jdbc); } diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index f2fc926a..2fadc412 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -27,9 +27,7 @@ profile=dev # Dependency versions micronautVersion=<%= javaDependencies['micronaut-platform'] %> -# The hibernate version should match the one managed by Micronaut data -# https://mvnrepository.com/artifact/io.micronaut.data/micronaut-data-hibernate-jpa/1.0.1 -hibernate_version=<%=versions.hibernate%> +hibernate_version=<%= javaManagedProperties['hibernate.version'] %> mapstruct_version=<%=javaDependencies.mapstruct%> archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %> logback_version=<%=versions.logback%> diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index 3d3014c6..098252a9 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -84,7 +84,6 @@ _%> <%= javaDependencies['micronaut-platform'] %> - <%= versions.hibernate %> <%= versions.logback %> <%- javaDependencies.mapstruct %> <%- javaDependencies['archunit-junit5'] %> From 11a7b277b2da3ec05065aff8a6548bc72261c1fe Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 12:58:11 -0300 Subject: [PATCH 24/41] Update generator.js --- generators/micronaut/generator.js | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 39ae53e4..de7c7174 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -10,7 +10,6 @@ import { writeFiles } from './files.js'; import { entityFiles } from './entity-files.js'; import { getCommonMavenDefinition, getDatabaseDriverForDatabase, getImperativeMavenDefinition } from './internal/dependencies.js'; -import constants from '../constants.cjs'; import { serverTestFrameworkChoices } from './command.js'; export default class extends BaseApplicationGenerator { From a3794f6d3f6cbbb72265d5a97c35bd691199d6c9 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 14 May 2024 12:58:55 -0300 Subject: [PATCH 25/41] drop plugins --- generators/micronaut/templates/build.gradle.ejs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index 6f2dd610..ebd8c4d2 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -21,11 +21,6 @@ plugins { id "maven-publish" id "idea" id "application" - id "com.gorylenko.gradle-git-properties" - <%_ if (enableSwaggerCodegen) { _%> - id "org.openapi.generator" - <%_ } _%> - id "com.github.johnrengelman.shadow" // jhipster-needle-gradle-plugins - JHipster will add additional gradle plugins here } From bc9c0e7b5351bf29af620a44979f156104322025 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 13:51:00 -0300 Subject: [PATCH 26/41] use liquibase version from micronaut-platform --- generators/micronaut/generator.js | 2 ++ generators/micronaut/resources/gradle/libs.versions.toml | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index de7c7174..4067677a 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -113,6 +113,8 @@ export default class extends BaseApplicationGenerator { const pomFile = this.readTemplate(this.templatePath('../resources/micronaut-platform.pom')).toString(); const pom = parseMavenPom(pomFile); Object.assign(application.javaManagedProperties, pom.project.properties); + // Liquibase generator uses this property, otherwise it will be used from gradle's dependenciesManagement plugin. + application.javaDependencies.liquibase = application.javaManagedProperties['liquibase.version']; }, }); } diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 8a05d7d4..f6dfaba9 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -9,8 +9,6 @@ jaxb-runtime = { module = 'org.glassfish.jaxb:jaxb-runtime', version = '4.0.5' } h2 = { module = 'com.h2database:h2', version = '2.2.224' } -liquibase = { module = 'org.liquibase:liquibase-core', version = '4.27.0' } - logstash-logback-encoder = { module = 'net.logstash.logback:logstash-logback-encoder', version = '7.4' } micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', version = '4.4.2' } From ef393e93ebaf783f4156e94dea9538dfc618af18 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 14:24:50 -0300 Subject: [PATCH 27/41] add typesafe dependency --- generators/micronaut/resources/gradle/libs.versions.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index f6dfaba9..0878f5f0 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -25,6 +25,9 @@ problem-violations = { module = 'org.zalando:problem-violations', version = '0.2 jackson-datatype-problem = { module = 'org.zalando:jackson-datatype-problem', version = '0.27.1' } +# caffeine +typesafe = { module = 'com.typesafe:config', version = '1.4.3' } + [plugins] micronaut-application = { id = 'io.micronaut.application', version = '4.3.8' } From 34ae01f6586c1f04b1f8287721aa5e299f0e888e Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 14:26:52 -0300 Subject: [PATCH 28/41] add javaDependencies.hibernate --- generators/micronaut/generator.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 4067677a..e0125fd3 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -113,8 +113,12 @@ export default class extends BaseApplicationGenerator { const pomFile = this.readTemplate(this.templatePath('../resources/micronaut-platform.pom')).toString(); const pom = parseMavenPom(pomFile); Object.assign(application.javaManagedProperties, pom.project.properties); + // Liquibase generator uses this property, otherwise it will be used from gradle's dependenciesManagement plugin. application.javaDependencies.liquibase = application.javaManagedProperties['liquibase.version']; + + // Used by getImperativeMavenDefinition for annotation processor. + application.javaDependencies.hibernate = application.javaManagedProperties['hibernate.version']; }, }); } From 493517aa83cde7dbc02665dd114d372191862dae Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 14:29:23 -0300 Subject: [PATCH 29/41] use ehcache.version from micronaut-platform --- generators/micronaut/generator.js | 3 +++ generators/micronaut/resources/gradle/libs.versions.toml | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index e0125fd3..cb5a592f 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -119,6 +119,9 @@ export default class extends BaseApplicationGenerator { // Used by getImperativeMavenDefinition for annotation processor. application.javaDependencies.hibernate = application.javaManagedProperties['hibernate.version']; + + // Used by micronaut-cache. + application.javaDependencies.ehcache = application.javaManagedProperties['ehcache.version']; }, }); } diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 0878f5f0..7b2655ce 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -1,8 +1,6 @@ [libraries] commons-lang3 = { module = 'org.apache.commons:commons-lang3', version = '3.14.0' } -ehcache = { module = 'org.ehcache:ehcache', version = '3.10.8' } - jakarta-validation = { module = 'jakarta.validation:jakarta.validation-api', version = '3.0.2' } jaxb-runtime = { module = 'org.glassfish.jaxb:jaxb-runtime', version = '4.0.5' } From 91dd1a4507990774bd6c8b0f42da5a8fa8986ba3 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 14:33:24 -0300 Subject: [PATCH 30/41] drop jakarta-validation version --- generators/micronaut/resources/gradle/libs.versions.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 7b2655ce..0f57f760 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -1,8 +1,6 @@ [libraries] commons-lang3 = { module = 'org.apache.commons:commons-lang3', version = '3.14.0' } -jakarta-validation = { module = 'jakarta.validation:jakarta.validation-api', version = '3.0.2' } - jaxb-runtime = { module = 'org.glassfish.jaxb:jaxb-runtime', version = '4.0.5' } h2 = { module = 'com.h2database:h2', version = '2.2.224' } From 20b7b5d300719a4f4d5b06287586539a137679d0 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 14:33:32 -0300 Subject: [PATCH 31/41] drop h2 version --- generators/micronaut/resources/gradle/libs.versions.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 0f57f760..15d59e72 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -3,8 +3,6 @@ commons-lang3 = { module = 'org.apache.commons:commons-lang3', version = '3.14.0 jaxb-runtime = { module = 'org.glassfish.jaxb:jaxb-runtime', version = '4.0.5' } -h2 = { module = 'com.h2database:h2', version = '2.2.224' } - logstash-logback-encoder = { module = 'net.logstash.logback:logstash-logback-encoder', version = '7.4' } micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', version = '4.4.2' } From ebb1002bb3b3415bfb5dd6ac2260a544ba771e50 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 14:38:42 -0300 Subject: [PATCH 32/41] drop mockito-core version --- generators/micronaut/generator.js | 2 +- generators/micronaut/resources/gradle/libs.versions.toml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index cb5a592f..6b3d9ba8 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -216,7 +216,7 @@ export default class extends BaseApplicationGenerator { { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', version: application.jhipsterDependenciesVersion }, { groupId: 'org.apache.commons', artifactId: 'commons-lang3', version: javaDependencies['commons-lang3'] }, { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', version: javaDependencies['swagger-annotations'] }, - { groupId: 'org.mockito', artifactId: 'mockito-core', version: javaDependencies['mockito-core'], scope: 'test' }, + { groupId: 'org.mockito', artifactId: 'mockito-core', scope: 'test' }, { groupId: 'org.zalando', artifactId: 'jackson-datatype-problem', version: javaDependencies['jackson-datatype-problem'] }, { groupId: 'org.zalando', artifactId: 'problem-violations', version: javaDependencies['problem-violations'] }, ], diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 15d59e72..b6f85010 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -7,8 +7,6 @@ logstash-logback-encoder = { module = 'net.logstash.logback:logstash-logback-enc micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', version = '4.4.2' } -mockito-core = { module = 'org.mockito:mockito-core', version = '5.10.0' } - redisson = { module = 'org.redisson:redisson', version = '3.30.0' } swagger-annotations = { module = 'io.swagger.core.v3:swagger-annotations', version = '2.2.19' } From da70ff6c7e0d803a01dafe1f64749faa1f6156fc Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 14:44:11 -0300 Subject: [PATCH 33/41] replace swagger-annotations with micronaut-openapi-annotations --- generators/micronaut/generator.js | 2 +- generators/micronaut/resources/gradle/libs.versions.toml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 6b3d9ba8..33dbb626 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -208,6 +208,7 @@ export default class extends BaseApplicationGenerator { const { javaDependencies } = application; source.addJavaDefinition({ dependencies: [ + { groupId: 'io.micronaut.openapi', artifactId: 'micronaut-openapi-annotations' }, { groupId: 'net.logstash.logback', artifactId: 'logstash-logback-encoder', @@ -215,7 +216,6 @@ export default class extends BaseApplicationGenerator { }, { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', version: application.jhipsterDependenciesVersion }, { groupId: 'org.apache.commons', artifactId: 'commons-lang3', version: javaDependencies['commons-lang3'] }, - { groupId: 'io.swagger.core.v3', artifactId: 'swagger-annotations', version: javaDependencies['swagger-annotations'] }, { groupId: 'org.mockito', artifactId: 'mockito-core', scope: 'test' }, { groupId: 'org.zalando', artifactId: 'jackson-datatype-problem', version: javaDependencies['jackson-datatype-problem'] }, { groupId: 'org.zalando', artifactId: 'problem-violations', version: javaDependencies['problem-violations'] }, diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index b6f85010..6d69e106 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -9,8 +9,6 @@ micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', vers redisson = { module = 'org.redisson:redisson', version = '3.30.0' } -swagger-annotations = { module = 'io.swagger.core.v3:swagger-annotations', version = '2.2.19' } - jbcrypt = { module = 'org.mindrot:jbcrypt', version = '0.4' } problem-violations = { module = 'org.zalando:problem-violations', version = '0.29.1' } From 68bc11951832ea115d2ad5e101993e85e8fd0672 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 15:47:20 -0300 Subject: [PATCH 34/41] Revert "drop jakarta-validation version" This reverts commit 91dd1a4507990774bd6c8b0f42da5a8fa8986ba3. --- generators/micronaut/resources/gradle/libs.versions.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 6d69e106..bd73445f 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -1,6 +1,8 @@ [libraries] commons-lang3 = { module = 'org.apache.commons:commons-lang3', version = '3.14.0' } +jakarta-validation = { module = 'jakarta.validation:jakarta.validation-api', version = '3.0.2' } + jaxb-runtime = { module = 'org.glassfish.jaxb:jaxb-runtime', version = '4.0.5' } logstash-logback-encoder = { module = 'net.logstash.logback:logstash-logback-encoder', version = '7.4' } From 7252b22300c4231adeed4b8b5df9a0449be6b2bc Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 16:01:14 -0300 Subject: [PATCH 35/41] Revert "drop h2 version" This reverts commit 20b7b5d300719a4f4d5b06287586539a137679d0. --- generators/micronaut/resources/gradle/libs.versions.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index bd73445f..5c239042 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -5,6 +5,8 @@ jakarta-validation = { module = 'jakarta.validation:jakarta.validation-api', ver jaxb-runtime = { module = 'org.glassfish.jaxb:jaxb-runtime', version = '4.0.5' } +h2 = { module = 'com.h2database:h2', version = '2.2.224' } + logstash-logback-encoder = { module = 'net.logstash.logback:logstash-logback-encoder', version = '7.4' } micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', version = '4.4.2' } From 241cc6646ea3f1e6596e4e2bf14d09e6db533ba3 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 15:53:37 -0300 Subject: [PATCH 36/41] add comment to h2 and jakarta-validation versions --- generators/micronaut/resources/gradle/libs.versions.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 5c239042..648cd122 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -1,10 +1,12 @@ [libraries] commons-lang3 = { module = 'org.apache.commons:commons-lang3', version = '3.14.0' } +# Required by Liquibase generator due to liquibase-maven-plugin jakarta-validation = { module = 'jakarta.validation:jakarta.validation-api', version = '3.0.2' } jaxb-runtime = { module = 'org.glassfish.jaxb:jaxb-runtime', version = '4.0.5' } +# Required by Liquibase generator due to liquibase-maven-plugin h2 = { module = 'com.h2database:h2', version = '2.2.224' } logstash-logback-encoder = { module = 'net.logstash.logback:logstash-logback-encoder', version = '7.4' } From dc8b3a78755d0e52dfed44bddbc983241de812bb Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 16:04:11 -0300 Subject: [PATCH 37/41] use h2.version from micronaut-platform --- generators/micronaut/generator.js | 2 ++ generators/micronaut/resources/gradle/libs.versions.toml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 33dbb626..99987a31 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -116,6 +116,8 @@ export default class extends BaseApplicationGenerator { // Liquibase generator uses this property, otherwise it will be used from gradle's dependenciesManagement plugin. application.javaDependencies.liquibase = application.javaManagedProperties['liquibase.version']; + // Required by Liquibase generator due to liquibase-maven-plugin + application.javaDependencies.h2 = application.javaManagedProperties['h2.version']; // Used by getImperativeMavenDefinition for annotation processor. application.javaDependencies.hibernate = application.javaManagedProperties['hibernate.version']; diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 648cd122..f4e385ed 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -6,9 +6,6 @@ jakarta-validation = { module = 'jakarta.validation:jakarta.validation-api', ver jaxb-runtime = { module = 'org.glassfish.jaxb:jaxb-runtime', version = '4.0.5' } -# Required by Liquibase generator due to liquibase-maven-plugin -h2 = { module = 'com.h2database:h2', version = '2.2.224' } - logstash-logback-encoder = { module = 'net.logstash.logback:logstash-logback-encoder', version = '7.4' } micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', version = '4.4.2' } From 32ff88b7a7a448a2c647dc2d6c182a915ba236c4 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 16:15:00 -0300 Subject: [PATCH 38/41] drop registerSpringFactory override --- generators/micronaut/generator.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 99987a31..69848d8f 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -146,8 +146,6 @@ export default class extends BaseApplicationGenerator { }); }, - registerSpringFactory: undefined, - addLogNeedles({ source, application }) { source.addIntegrationTestAnnotation = ({ package: packageName, annotation }) => this.editFile(this.destinationPath(`${application.javaPackageTestDir}IntegrationTest.java`), content => From befb46a2de3d13ca0f0ade84e73bbcf8758b99bd Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 16:15:32 -0300 Subject: [PATCH 39/41] drop DOCKER_REDIS --- generators/constants.cjs | 1 - generators/micronaut/generator.js | 1 - 2 files changed, 2 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index 60703564..89e3c86c 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -18,7 +18,6 @@ */ module.exports = { - DOCKER_REDIS: 'redis:6.0.10', sqlDb: { h2Disk: { driver: 'org.h2.Driver', diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js index 69848d8f..d4ba80c4 100644 --- a/generators/micronaut/generator.js +++ b/generators/micronaut/generator.js @@ -138,7 +138,6 @@ export default class extends BaseApplicationGenerator { prepareForTemplates({ application }) { // Workaround application.MN_CONSTANTS = mnConstants; - application.dockerContainers.redis = mnConstants.DOCKER_REDIS; // Add liquibase h2 database references. application.liquibaseAddH2Properties = true; Object.assign(application, { From e81e968e94272213f1775b17e35a0e75c98a50ac Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 16:19:52 -0300 Subject: [PATCH 40/41] drop logback constant --- generators/constants.cjs | 3 --- generators/micronaut/templates/build.gradle.ejs | 2 +- .../micronaut/templates/gradle.properties.ejs | 1 - generators/micronaut/templates/pom.xml.ejs | 13 ------------- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/generators/constants.cjs b/generators/constants.cjs index 89e3c86c..1825abc8 100644 --- a/generators/constants.cjs +++ b/generators/constants.cjs @@ -48,7 +48,4 @@ module.exports = { dialect: 'org.hibernate.dialect.SQLServer2012Dialect', }, }, - versions: { - logback: '1.5.3', - }, }; diff --git a/generators/micronaut/templates/build.gradle.ejs b/generators/micronaut/templates/build.gradle.ejs index ebd8c4d2..926f8e60 100644 --- a/generators/micronaut/templates/build.gradle.ejs +++ b/generators/micronaut/templates/build.gradle.ejs @@ -212,7 +212,7 @@ dependencies { <%_ } _%> annotationProcessor "io.micronaut.openapi:micronaut-openapi" - implementation "ch.qos.logback:logback-classic:$logback_version" + implementation "ch.qos.logback:logback-classic" implementation "io.micrometer:micrometer-registry-prometheus" implementation "com.fasterxml.jackson.core:jackson-annotations" diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs index 2fadc412..c15c31cb 100644 --- a/generators/micronaut/templates/gradle.properties.ejs +++ b/generators/micronaut/templates/gradle.properties.ejs @@ -30,7 +30,6 @@ micronautVersion=<%= javaDependencies['micronaut-platform'] %> hibernate_version=<%= javaManagedProperties['hibernate.version'] %> mapstruct_version=<%=javaDependencies.mapstruct%> archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %> -logback_version=<%=versions.logback%> <%_ if (enableSwaggerCodegen) { _%> jackson_databind_nullable_version=<%= javaDependencies['jackson-databind-nullable'] %> <%_ } _%> diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs index 098252a9..6d157b72 100644 --- a/generators/micronaut/templates/pom.xml.ejs +++ b/generators/micronaut/templates/pom.xml.ejs @@ -84,7 +84,6 @@ _%> <%= javaDependencies['micronaut-platform'] %> - <%= versions.logback %> <%- javaDependencies.mapstruct %> <%- javaDependencies['archunit-junit5'] %> @@ -137,18 +136,6 @@ _%> ch.qos.logback logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - - - - - ch.qos.logback - logback-core - ${logback.version} io.micronaut.validation From ba855fe7dbc6dbfecc5b6f7bc0b9b4e00d562e93 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 14 May 2024 16:22:05 -0300 Subject: [PATCH 41/41] don't show micronaut version in cli logo --- cli/logo.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cli/logo.js b/cli/logo.js index 8a3d14b0..5fe45f95 100644 --- a/cli/logo.js +++ b/cli/logo.js @@ -1,11 +1,6 @@ import chalk from 'chalk'; -import constants from '../generators/constants.cjs'; import { readFileSync } from 'fs'; -const { - versions: { micronaut: MICRONAUT_VERSION }, -} = constants; - export function getLogo() { const { version } = JSON.parse(readFileSync(new URL('../package.json', import.meta.url))); @@ -19,7 +14,7 @@ ${chalk.blue(' ╚═╝ ╚═╝')}${chalk.green(' ╚═╝ ╚═╝ ${chalk.white.bold(' https://www.jhipster.tech')} ${chalk.blue.bold(' https://micronaut.io\n')} -${chalk.white(` Welcome to MHipster v${chalk.white.bold(version)} :: Running Micronaut v${chalk.white.bold(MICRONAUT_VERSION)}`)} +${chalk.white(` Welcome to MHipster v${chalk.white.bold(version)}`)} ${chalk.white(' This blueprint generates your backend as a Micronaut Java project.')} ${chalk.green(' _______________________________________________________________________________________________________________\n')} ${chalk.white(` ${chalk.yellow('::')} This project is a ${chalk.blue.bold('Micronaut')} blueprint for ${chalk.green.bold('JHipster')}`)}