diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap index 79c54b4efd70..de5606287876 100644 --- a/generators/app/__snapshots__/generator.spec.ts.snap +++ b/generators/app/__snapshots__/generator.spec.ts.snap @@ -467,7 +467,6 @@ exports[`generator - app with default config should match snapshot 1`] = ` ], "javaDependencies": { "archunit-junit5": "'ARCHUNIT-JUNIT-5-VERSION'", - "awaitility": "'AWAITILITY-VERSION'", "blockhound-junit-platform": "'BLOCKHOUND-JUNIT-PLATFORM-VERSION'", "checkstyle": "'CHECKSTYLE-VERSION'", "checksum-maven-plugin": "'CHECKSUM-MAVEN-PLUGIN-VERSION'", @@ -483,17 +482,14 @@ exports[`generator - app with default config should match snapshot 1`] = ` "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'", "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'", "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'", - "h2": "'H-2-VERSION'", "hazelcast-hibernate53": "'HAZELCAST-HIBERNATE-53-VERSION'", "hazelcast-spring": "'HAZELCAST-SPRING-VERSION'", "jackson-databind-nullable": "'JACKSON-DATABIND-NULLABLE-VERSION'", "jacoco-maven-plugin": "'JACOCO-MAVEN-PLUGIN-VERSION'", - "jaxb-runtime": "'JAXB-RUNTIME-VERSION'", "jhipster-dependabot": "'JHIPSTER-DEPENDABOT-VERSION'", "jib-maven-plugin": "'JIB-MAVEN-PLUGIN-VERSION'", "junit-platform-launcher": "'JUNIT-PLATFORM-LAUNCHER-VERSION'", "lifecycle-mapping": "'LIFECYCLE-MAPPING-VERSION'", - "liquibase": "'LIQUIBASE-VERSION'", "mapstruct": "'MAPSTRUCT-VERSION'", "maven-antrun-plugin": "'MAVEN-ANTRUN-PLUGIN-VERSION'", "maven-checkstyle-plugin": "'MAVEN-CHECKSTYLE-PLUGIN-VERSION'", @@ -518,9 +514,7 @@ 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-pulsar": "'SPRING-PULSAR-VERSION'", "typesafe": "'TYPESAFE-VERSION'", - "validation-api": "'VALIDATION-API-VERSION'", }, "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/", "javaPackageTestDir": "src/test/java/com/mycompany/myapp/", @@ -1038,7 +1032,6 @@ exports[`generator - app with gateway should match snapshot 1`] = ` ], "javaDependencies": { "archunit-junit5": "'ARCHUNIT-JUNIT-5-VERSION'", - "awaitility": "'AWAITILITY-VERSION'", "blockhound-junit-platform": "'BLOCKHOUND-JUNIT-PLATFORM-VERSION'", "checkstyle": "'CHECKSTYLE-VERSION'", "checksum-maven-plugin": "'CHECKSUM-MAVEN-PLUGIN-VERSION'", @@ -1054,17 +1047,14 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'", "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'", "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'", - "h2": "'H-2-VERSION'", "hazelcast-hibernate53": "'HAZELCAST-HIBERNATE-53-VERSION'", "hazelcast-spring": "'HAZELCAST-SPRING-VERSION'", "jackson-databind-nullable": "'JACKSON-DATABIND-NULLABLE-VERSION'", "jacoco-maven-plugin": "'JACOCO-MAVEN-PLUGIN-VERSION'", - "jaxb-runtime": "'JAXB-RUNTIME-VERSION'", "jhipster-dependabot": "'JHIPSTER-DEPENDABOT-VERSION'", "jib-maven-plugin": "'JIB-MAVEN-PLUGIN-VERSION'", "junit-platform-launcher": "'JUNIT-PLATFORM-LAUNCHER-VERSION'", "lifecycle-mapping": "'LIFECYCLE-MAPPING-VERSION'", - "liquibase": "'LIQUIBASE-VERSION'", "mapstruct": "'MAPSTRUCT-VERSION'", "maven-antrun-plugin": "'MAVEN-ANTRUN-PLUGIN-VERSION'", "maven-checkstyle-plugin": "'MAVEN-CHECKSTYLE-PLUGIN-VERSION'", @@ -1089,9 +1079,7 @@ 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-pulsar": "'SPRING-PULSAR-VERSION'", "typesafe": "'TYPESAFE-VERSION'", - "validation-api": "'VALIDATION-API-VERSION'", }, "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/", "javaPackageTestDir": "src/test/java/com/mycompany/myapp/", @@ -1609,7 +1597,6 @@ exports[`generator - app with microservice should match snapshot 1`] = ` ], "javaDependencies": { "archunit-junit5": "'ARCHUNIT-JUNIT-5-VERSION'", - "awaitility": "'AWAITILITY-VERSION'", "blockhound-junit-platform": "'BLOCKHOUND-JUNIT-PLATFORM-VERSION'", "checkstyle": "'CHECKSTYLE-VERSION'", "checksum-maven-plugin": "'CHECKSUM-MAVEN-PLUGIN-VERSION'", @@ -1625,17 +1612,14 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'", "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'", "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'", - "h2": "'H-2-VERSION'", "hazelcast-hibernate53": "'HAZELCAST-HIBERNATE-53-VERSION'", "hazelcast-spring": "'HAZELCAST-SPRING-VERSION'", "jackson-databind-nullable": "'JACKSON-DATABIND-NULLABLE-VERSION'", "jacoco-maven-plugin": "'JACOCO-MAVEN-PLUGIN-VERSION'", - "jaxb-runtime": "'JAXB-RUNTIME-VERSION'", "jhipster-dependabot": "'JHIPSTER-DEPENDABOT-VERSION'", "jib-maven-plugin": "'JIB-MAVEN-PLUGIN-VERSION'", "junit-platform-launcher": "'JUNIT-PLATFORM-LAUNCHER-VERSION'", "lifecycle-mapping": "'LIFECYCLE-MAPPING-VERSION'", - "liquibase": "'LIQUIBASE-VERSION'", "mapstruct": "'MAPSTRUCT-VERSION'", "maven-antrun-plugin": "'MAVEN-ANTRUN-PLUGIN-VERSION'", "maven-checkstyle-plugin": "'MAVEN-CHECKSTYLE-PLUGIN-VERSION'", @@ -1660,9 +1644,7 @@ 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-pulsar": "'SPRING-PULSAR-VERSION'", "typesafe": "'TYPESAFE-VERSION'", - "validation-api": "'VALIDATION-API-VERSION'", }, "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/", "javaPackageTestDir": "src/test/java/com/mycompany/myapp/", diff --git a/generators/liquibase/generator.ts b/generators/liquibase/generator.ts index 2bcc0ef9bdd5..61baf423bcc4 100644 --- a/generators/liquibase/generator.ts +++ b/generators/liquibase/generator.ts @@ -339,7 +339,7 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator { properties: [ { property: 'liquibase-plugin.hibernate-dialect' }, { property: 'liquibase-plugin.driver' }, - { property: 'h2.version', value: application.javaDependencies.h2 }, + { property: 'h2.version', value: application.springBootDependencies!.h2 }, { inProfile: 'dev', property: 'liquibase-plugin.hibernate-dialect', value: applicationAny.devHibernateDialect }, { inProfile: 'prod', property: 'liquibase-plugin.hibernate-dialect', value: applicationAny.prodHibernateDialect }, { inProfile: 'dev', property: 'liquibase-plugin.driver', value: applicationAny.devJdbcDriver }, @@ -355,7 +355,7 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator { properties: [ { inProfile: 'no-liquibase', property: 'profile.no-liquibase', value: ',no-liquibase' }, { property: 'profile.no-liquibase' }, - { property: 'liquibase.version', value: application.javaDependencies.liquibase }, + { property: 'liquibase.version', value: application.springBootDependencies!.liquibase }, { property: 'liquibase-plugin.url' }, { property: 'liquibase-plugin.username' }, { property: 'liquibase-plugin.password' }, @@ -446,10 +446,7 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator { source.addGradleProperty?.({ property: 'liquibaseTaskPrefix', value: 'liquibase' }); source.addGradleProperty?.({ property: 'liquibasePluginVersion', value: application.javaDependencies['gradle-liquibase'] }); - source.addGradleProperty?.({ property: 'liquibaseVersion', value: application.javaDependencies.liquibase }); - if (application.databaseTypeSql && !application.reactive) { - source.addGradleProperty?.({ property: 'liquibaseHibernate6Version', value: application.javaDependencies.liquibase }); - } + source.addGradleProperty?.({ property: 'liquibaseVersion', value: application.springBootDependencies!.liquibase }); source.applyFromGradle?.({ script: 'gradle/liquibase.gradle' }); source.addGradlePlugin?.({ id: 'org.liquibase.gradle' }); diff --git a/generators/liquibase/support/maven-plugin.ts b/generators/liquibase/support/maven-plugin.ts index 2a1507c78456..cafcdea29c16 100644 --- a/generators/liquibase/support/maven-plugin.ts +++ b/generators/liquibase/support/maven-plugin.ts @@ -43,11 +43,6 @@ export default function mavenPluginContent({ org.springframework.boot spring-boot-starter-data-jpa \${spring-boot.version} - - - jakarta.validation - jakarta.validation-api - \${validation-api.version} ` : ''}${devDatabaseTypeH2Any? ` com.h2database diff --git a/generators/liquibase/templates/gradle/liquibase.gradle.ejs b/generators/liquibase/templates/gradle/liquibase.gradle.ejs index fa88d0d17a16..c64ac637fba0 100644 --- a/generators/liquibase/templates/gradle/liquibase.gradle.ejs +++ b/generators/liquibase/templates/gradle/liquibase.gradle.ejs @@ -9,7 +9,7 @@ dependencies { liquibaseRuntime "info.picocli:picocli:<%- javaDependencies.picocli %>" <%_ if (databaseTypeSql && !reactive) { _%> - liquibaseRuntime "org.liquibase.ext:liquibase-hibernate6:${liquibaseHibernate6Version}" + liquibaseRuntime "org.liquibase.ext:liquibase-hibernate6:${liquibaseVersion}" <%_ } _%> <%_ if (databaseTypeSql) { _%> <%_ if (prodDatabaseType !== devDatabaseType) { _%> @@ -26,7 +26,7 @@ dependencies { <%_ } _%> <%_ if (prodDatabaseTypeMssql) { _%> liquibaseRuntime "com.microsoft.sqlserver:mssql-jdbc" - liquibaseRuntime "org.liquibase.ext:liquibase-mssql:<%- javaDependencies.liquibase %>" + liquibaseRuntime "org.liquibase.ext:liquibase-mssql:${liquibaseVersion}" <%_ } _%> <%_ if (prodDatabaseTypeOracle) { _%> liquibaseRuntime "com.oracle.database.jdbc:ojdbc8" @@ -93,16 +93,6 @@ liquibase { liquibaseDiff.dependsOn compileJava liquibaseDiffChangelog.dependsOn compileJava - -configurations { - all { - resolutionStrategy { - // Inherited version from Spring Boot can't be used because of regressions: - // To be removed as soon as spring-boot use the same version - force 'org.liquibase:liquibase-core:<%- javaDependencies.liquibase %>' - } - } -} <%_ if (backendTypeSpringBoot) { _%> ext { diff --git a/generators/server/resources/pom.xml b/generators/server/resources/pom.xml index 54341a0baaa0..83232caf18dd 100644 --- a/generators/server/resources/pom.xml +++ b/generators/server/resources/pom.xml @@ -9,23 +9,17 @@ 1.2.1 - 4.2.0 1.0.8.RELEASE 1.9.4 3.10.4 - 2.2.224 5.1.0 5.3.6 0.2.6 - 4.0.5 1.10.2 - 4.26.0 1.5.5.Final 1.1.1 4.7.5 - 0.2.0 1.4.3 - 3.0.2 10.14.1 @@ -88,46 +82,21 @@ gatling-charts-highcharts ${gatling.version} - - com.h2database - h2 - ${h2.version} - io.projectreactor.tools blockhound-junit-platform ${blockhound-junit-platform.version} - - jakarta.validation - jakarta.validation-api - ${validation-api.version} - io.micrometer context-propagation ${micrometer-context-propagation.version} - - org.awaitility - awaitility - ${awaitility.version} - - - org.glassfish.jaxb - jaxb-runtime - ${jaxb-runtime.version} - org.junit.platform junit-platform-launcher ${junit-platform-launcher.version} - - org.liquibase - liquibase-core - ${liquibase.version} - org.mapstruct mapstruct @@ -138,11 +107,6 @@ picocli ${picocli.version} - - org.springframework.pulsar - spring-pulsar-spring-cloud-stream-binder - ${spring-pulsar.version} - org.openapitools jackson-databind-nullable diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index 486c99742bb2..9f2116e36093 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.ejs @@ -242,7 +242,7 @@ dependencies { <%_ } _%> implementation "org.apache.commons:commons-lang3" <%_ if (searchEngineElasticsearch) { _%> - testImplementation "org.awaitility:awaitility:${awaitilityVersion}" + testImplementation "org.awaitility:awaitility" <%_ } _%> <%_ if (databaseTypeSql && !reactive) { _%> implementation "org.hibernate.orm:hibernate-core" diff --git a/generators/server/templates/gradle.properties.ejs b/generators/server/templates/gradle.properties.ejs index 662bc3b8b43d..1a636c053c54 100644 --- a/generators/server/templates/gradle.properties.ejs +++ b/generators/server/templates/gradle.properties.ejs @@ -40,9 +40,6 @@ blockhoundJunitPlatformVersion=<%- javaDependencies['blockhound-junit-platform'] junitPlatformLauncherVersion=<%- javaDependencies['junit-platform-launcher'] %> <%_ } _%> -<%_ if (databaseTypeSql) { _%> -jaxbRuntimeVersion=<%- javaDependencies['jaxb-runtime'] %> -<%_ } _%> <%_ if (databaseTypeCassandra) { _%> # The cassandra driver version should match the one managed by # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/<%- javaDependencies['spring-boot'] %> @@ -62,9 +59,6 @@ openapiPluginVersion=<%- javaDependencies['openapi-generator-maven-plugin'] %> gradleEnterprisePluginVersion=<%- javaDependencies['gradle-enterprise'] %> gradleCommonCustomUserDataPluginVersion=<%- javaDependencies['common-custom-user-data-gradle-plugin'] %> <%_ } _%> -<%_ if (searchEngineElasticsearch) { _%> -awaitilityVersion=<%- javaDependencies.awaitility %> -<%_ } _%> # jhipster-needle-gradle-property - JHipster will add additional properties here diff --git a/generators/spring-cloud-stream/generators/pulsar/generator.ts b/generators/spring-cloud-stream/generators/pulsar/generator.ts index 7697d1d8f6a2..15c763cf3458 100644 --- a/generators/spring-cloud-stream/generators/pulsar/generator.ts +++ b/generators/spring-cloud-stream/generators/pulsar/generator.ts @@ -59,10 +59,7 @@ export default class PulsarGenerator extends BaseApplicationGenerator { }, applyPulsarGradleConventionPlugin({ source, application }) { if (application.buildToolGradle) { - const { javaDependencies } = application; source.addGradlePlugin?.({ id: 'jhipster.pulsar-conventions' }); - source.addGradleDependencyCatalogVersion?.({ name: 'pulsar-spring', version: javaDependencies?.['spring-pulsar'] }); - source.addGradleBuildSrcDependencyCatalogVersion?.({ name: 'pulsar-spring', version: javaDependencies?.['spring-pulsar'] }); } }, addPulsarMavenDependencies({ application, source }) { @@ -72,12 +69,7 @@ export default class PulsarGenerator extends BaseApplicationGenerator { properties: [{ property: 'spring-pulsar.version', value: javaDependencies?.['spring-pulsar'] }], dependencies: [ { groupId: 'org.springframework.cloud', artifactId: 'spring-cloud-stream' }, - { - groupId: 'org.springframework.pulsar', - artifactId: 'spring-pulsar-spring-cloud-stream-binder', - // eslint-disable-next-line no-template-curly-in-string - version: '${spring-pulsar.version}', - }, + { groupId: 'org.springframework.cloud', artifactId: 'spring-cloud-stream-binder-pulsar' }, { groupId: 'org.testcontainers', artifactId: 'junit-jupiter', scope: 'test' }, { groupId: 'org.testcontainers', artifactId: 'testcontainers', scope: 'test' }, { groupId: 'org.testcontainers', artifactId: 'pulsar', scope: 'test' }, diff --git a/generators/spring-cloud-stream/generators/pulsar/templates/buildSrc/src/main/groovy/jhipster.pulsar-conventions.gradle.ejs b/generators/spring-cloud-stream/generators/pulsar/templates/buildSrc/src/main/groovy/jhipster.pulsar-conventions.gradle.ejs index 4a37b22f34f5..7dd7cbe774fe 100644 --- a/generators/spring-cloud-stream/generators/pulsar/templates/buildSrc/src/main/groovy/jhipster.pulsar-conventions.gradle.ejs +++ b/generators/spring-cloud-stream/generators/pulsar/templates/buildSrc/src/main/groovy/jhipster.pulsar-conventions.gradle.ejs @@ -1,8 +1,6 @@ dependencies { implementation "org.springframework.cloud:spring-cloud-stream" - implementation ("org.springframework.pulsar:spring-pulsar-spring-cloud-stream-binder:${libs.versions.spring.pulsar.get()}") { - exclude group: 'org.springframework.boot', module: 'spring-boot-starter' - } + implementation "org.springframework.cloud:spring-cloud-stream-binder-pulsar" testImplementation "org.testcontainers:junit-jupiter" testImplementation "org.testcontainers:pulsar" testImplementation "org.testcontainers:testcontainers" diff --git a/generators/spring-data-elasticsearch/generator.js b/generators/spring-data-elasticsearch/generator.js index f9fdf5de9336..e6d428e7c4ba 100644 --- a/generators/spring-data-elasticsearch/generator.js +++ b/generators/spring-data-elasticsearch/generator.js @@ -81,11 +81,6 @@ export default class ElasticsearchGenerator extends BaseApplicationGenerator { }, addDependencies({ application, source }) { if (application.buildToolMaven) { - source.addMavenProperty?.({ - property: 'awaitility.version', - value: application.javaDependencies.awaitility, - }); - source.addMavenDependency?.([ { groupId: 'org.springframework.boot', @@ -94,8 +89,6 @@ export default class ElasticsearchGenerator extends BaseApplicationGenerator { { groupId: 'org.awaitility', artifactId: 'awaitility', - // eslint-disable-next-line no-template-curly-in-string - version: '${awaitility.version}', scope: 'test', }, { diff --git a/generators/spring-data-relational/generator.ts b/generators/spring-data-relational/generator.ts index 9bd81aafbd9c..ef7aad9a634a 100644 --- a/generators/spring-data-relational/generator.ts +++ b/generators/spring-data-relational/generator.ts @@ -162,7 +162,7 @@ export default class SqlGenerator extends BaseApplicationGenerator = { export const getDatabaseDriverForDatabase = (databaseType: string) => databaseArtifactForDB[databaseType]; -export const getCommonMavenDefinition = ({ javaDependencies }: { javaDependencies: Record }) => ({ - properties: [ - { property: 'jaxb-runtime.version', value: javaDependencies['jaxb-runtime'] }, - { property: 'validation-api.version', value: javaDependencies['validation-api'] }, - ], +export const getCommonMavenDefinition = ({ springBootDependencies }: { springBootDependencies: Record }) => ({ + properties: [{ property: 'jaxb-runtime.version', value: springBootDependencies['glassfish-jaxb'] }], dependencies: [ { groupId: 'com.zaxxer', artifactId: 'HikariCP' }, { groupId: 'com.fasterxml.jackson.module', artifactId: 'jackson-module-jaxb-annotations' },