diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a76bc1af..c536b895 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,20 +19,8 @@ version: 2 updates: - - package-ecosystem: 'maven' - directory: '/generators/server/templates/' - schedule: - interval: 'daily' - # Maven doesn't have many PRs, but it triggers every client workflow. Let 2h of interval. - time: '05:00' - open-pull-requests-limit: 5 - labels: - - 'theme: dependencies' - - 'theme: java' - - 'skip-changelog' - - package-ecosystem: 'gradle' - directory: '/generators/server/templates' + directory: '/generators/server/resources' schedule: interval: 'daily' time: '08:00' diff --git a/generators/server/generator.js b/generators/server/generator.js index 88decf29..04de80b8 100644 --- a/generators/server/generator.js +++ b/generators/server/generator.js @@ -111,8 +111,14 @@ export default class extends ServerGenerator { get [ServerGenerator.PREPARING]() { return this.asPreparingTaskGroup({ ...super.preparing, + loadDependencies({ application }) { + application.micronautDependencies = mnConstants.dependencies; + this.loadJavaDependenciesFromGradleCatalog(application.micronautDependencies); + + // Workaound liquibase generator bug + application.springBootDependencies = { liquibase: mnConstants.versions.liquibase, h2: application.micronautDependencies.h2 }; + }, configure({ application }) { - application.springBootDependencies = { liquibase: mnConstants.versions.liquibase }; if (application.authenticationTypeOauth2) { application.syncUserWithIdp = true; application.generateBuiltInUserEntity = true; diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml new file mode 100644 index 00000000..fb848354 --- /dev/null +++ b/generators/server/resources/gradle/libs.versions.toml @@ -0,0 +1,2 @@ +[libraries] +h2 = { module = 'com.h2database:h2', version = '2.2.224' }