generator-jhipster 8.7.1 → 8.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/cli/commands.d.mts +89 -89
- package/dist/cli/environment-builder.d.mts +7 -6
- package/dist/cli/environment-builder.mjs +5 -3
- package/dist/cli/jhipster-command.d.mts +2 -2
- package/dist/cli/jhipster-command.mjs +13 -4
- package/dist/cli/program.d.mts +53 -36
- package/dist/cli/program.mjs +41 -32
- package/dist/cli/utils.d.mts +2 -3
- package/dist/cli/utils.mjs +11 -21
- package/dist/generators/angular/generator.js +2 -2
- package/dist/generators/angular/resources/package.json +13 -13
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-routes.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/app.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.ts.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/auth-jwt.service.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/auth-session.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/csrf.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/state-storage.service.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/tracker/tracker.service.ts.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.service.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.service.ts.ejs +1 -1
- package/dist/generators/base/api.d.ts +10 -4
- package/dist/generators/base/generator.d.ts +4 -0
- package/dist/generators/base/generator.js +10 -1
- package/dist/generators/base/shared-data.js +2 -0
- package/dist/generators/base/support/faker.d.ts +1 -1
- package/dist/generators/base/support/faker.js +1 -1
- package/dist/generators/base/support/timestamp.js +10 -2
- package/dist/generators/base-application/support/prepare-entity.js +6 -1
- package/dist/generators/base-application/support/prepare-field.js +40 -16
- package/dist/generators/base-application/support/prepare-relationship.d.ts +1 -1
- package/dist/generators/base-application/support/task-type-inference.d.ts +18 -18
- package/dist/generators/base-application/types.d.ts +4 -0
- package/dist/generators/base-core/generator.d.ts +7 -4
- package/dist/generators/base-core/generator.js +31 -35
- package/dist/generators/base-workspaces/generator.d.ts +34 -1
- package/dist/generators/base-workspaces/generator.js +1 -1
- package/dist/generators/base-workspaces/internal/docker-base.js +1 -3
- package/dist/generators/bootstrap/support/eslint-transform.js +2 -2
- package/dist/generators/bootstrap/support/java-unused-imports-transform.js +2 -2
- package/dist/generators/bootstrap/support/prettier-support.js +2 -2
- package/dist/generators/bootstrap-application-base/generator.d.ts +2 -2
- package/dist/generators/bootstrap-application-base/generator.js +19 -5
- package/dist/generators/bootstrap-application-base/utils.d.ts +3 -3
- package/dist/generators/bootstrap-application-base/utils.js +9 -3
- package/dist/generators/bootstrap-workspaces/command.d.ts +12 -2
- package/dist/generators/bootstrap-workspaces/command.js +5 -3
- package/dist/generators/bootstrap-workspaces/generator.d.ts +8 -2
- package/dist/generators/bootstrap-workspaces/generator.js +0 -2
- package/dist/generators/bootstrap-workspaces/index.d.ts +1 -0
- package/dist/generators/bootstrap-workspaces/index.js +1 -0
- package/dist/generators/client/command.d.ts +22 -0
- package/dist/generators/client/command.js +22 -0
- package/dist/generators/client/files-common.js +1 -1
- package/dist/generators/client/generator.js +4 -5
- package/dist/generators/client/prompts.js +10 -9
- package/dist/generators/client/resources/package.json +3 -3
- package/dist/generators/client/templates/webpack/webpack.microfrontend.js.jhi.ejs +16 -5
- package/dist/generators/common/generator.js +2 -2
- package/dist/generators/common/resources/package.json +1 -1
- package/dist/generators/cypress/files.js +6 -0
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/login-page.cy.ts.ejs +2 -2
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/logout.cy.ts.ejs +39 -0
- package/dist/generators/docker/generator.d.ts +1 -1
- package/dist/generators/docker/templates/docker/keycloak.yml.ejs +2 -1
- package/dist/generators/docker-compose/command.js +9 -1
- package/dist/generators/docker-compose/generator.d.ts +11 -53
- package/dist/generators/docker-compose/generator.js +24 -23
- package/dist/generators/generate-blueprint/command.d.ts +97 -20
- package/dist/generators/generate-blueprint/command.js +28 -0
- package/dist/generators/generate-blueprint/constants.d.ts +2 -2
- package/dist/generators/generate-blueprint/files.d.ts +1 -42
- package/dist/generators/generate-blueprint/files.js +27 -29
- package/dist/generators/generate-blueprint/generator.d.ts +5 -2
- package/dist/generators/generate-blueprint/generator.js +78 -22
- package/dist/generators/generate-blueprint/resources/package.json +3 -3
- package/dist/generators/generate-blueprint/templates/.github/workflows/samples.yml.ejs +6 -8
- package/dist/generators/generate-blueprint/templates/README.md.ejs +12 -2
- package/dist/generators/generate-blueprint/templates/cli/cli-customizations.cjs.ejs +2 -0
- package/dist/generators/generate-blueprint/templates/cli/cli.cjs.ejs +2 -1
- package/dist/generators/generate-blueprint/templates/cli/commands.cjs.ejs +1 -1
- package/dist/generators/generate-blueprint/templates/eslint.config.js.jhi.blueprint.ejs +3 -2
- package/dist/generators/generate-blueprint/templates/generators/generator/command.mjs.ejs +8 -12
- package/dist/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs +8 -11
- package/dist/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +2 -2
- package/dist/generators/generate-blueprint/templates/generators/generator/index.mjs.ejs +2 -4
- package/dist/generators/generate-blueprint/templates/vitest.config.ts.ejs +0 -1
- package/dist/generators/generator-constants.d.ts +2 -2
- package/dist/generators/generator-constants.js +3 -3
- package/dist/generators/git/command.d.ts +10 -0
- package/dist/generators/git/command.js +10 -0
- package/dist/generators/git/generator.d.ts +5 -4
- package/dist/generators/git/generator.js +6 -4
- package/dist/generators/gradle/generators/node-gradle/templates/buildSrc/src/main/groovy/jhipster.node-gradle-conventions.gradle.ejs +16 -10
- package/dist/generators/gradle/internal/needles.d.ts +3 -1
- package/dist/generators/gradle/internal/needles.js +10 -5
- package/dist/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties +1 -1
- package/dist/generators/gradle/types.d.ts +3 -2
- package/dist/generators/init/command.d.ts +4 -20
- package/dist/generators/init/command.js +1 -1
- package/dist/generators/init/resources/.node-version +1 -1
- package/dist/generators/java/command.d.ts +3 -5
- package/dist/generators/java/command.js +1 -20
- package/dist/generators/java/generators/bootstrap/command.d.ts +7 -0
- package/dist/generators/java/generators/bootstrap/command.js +7 -0
- package/dist/generators/java/generators/build-tool/generator.js +37 -13
- package/dist/generators/java/generators/graalvm/command.d.ts +5 -0
- package/dist/generators/java/generators/graalvm/command.js +5 -0
- package/dist/generators/java/generators/graalvm/generator.d.ts +9 -0
- package/dist/generators/java/generators/graalvm/generator.js +222 -0
- package/dist/generators/java/generators/graalvm/index.d.ts +20 -0
- package/dist/generators/java/generators/graalvm/index.js +20 -0
- package/dist/generators/java/generators/graalvm/internal/maven-definition.d.ts +8 -0
- package/dist/generators/java/generators/graalvm/internal/maven-definition.js +130 -0
- package/dist/generators/java/generators/graalvm/resources/build.gradle +1 -0
- package/dist/generators/java/generators/graalvm/resources/gradle/libs.versions.toml +5 -0
- package/dist/generators/java/generators/graalvm/templates/README.md.jhi.native.ejs +53 -0
- package/dist/generators/java/generators/graalvm/templates/gradle/native.gradle.ejs +44 -0
- package/dist/generators/java/generators/graalvm/templates/src/main/java/_package_/config/NativeConfiguration.java.ejs +14 -0
- package/dist/generators/java/generators/node/generator.d.ts +6 -18
- package/dist/generators/java/generators/node/generator.js +31 -0
- package/dist/generators/java/generators/openapi-generator/generator.js +2 -2
- package/dist/generators/java/support/util.d.ts +1 -1
- package/dist/generators/java/types.d.ts +4 -1
- package/dist/generators/javascript/generators/bootstrap/command.d.ts +21 -20
- package/dist/generators/javascript/generators/bootstrap/generator.d.ts +1 -2
- package/dist/generators/javascript/generators/bootstrap/generator.js +9 -5
- package/dist/generators/javascript/types.d.ts +9 -2
- package/dist/generators/kubernetes/command.d.ts +12 -0
- package/dist/generators/kubernetes/command.js +12 -0
- package/dist/generators/kubernetes/index.d.ts +1 -0
- package/dist/generators/kubernetes/index.js +1 -0
- package/dist/generators/kubernetes-helm/index.d.ts +1 -0
- package/dist/generators/kubernetes-helm/index.js +1 -0
- package/dist/generators/kubernetes-knative/generator.d.ts +1 -1
- package/dist/generators/kubernetes-knative/index.d.ts +1 -0
- package/dist/generators/kubernetes-knative/index.js +1 -0
- package/dist/generators/languages/entity-files.d.ts +3 -2
- package/dist/generators/languages/entity-files.js +0 -1
- package/dist/generators/languages/generator.d.ts +1 -0
- package/dist/generators/languages/generator.js +1 -0
- package/dist/generators/liquibase/files.js +8 -0
- package/dist/generators/liquibase/generator.d.ts +1 -1
- package/dist/generators/liquibase/generator.js +15 -0
- package/dist/generators/liquibase/templates/src/main/resources/META-INF/native-image/liquibase/reflect-config.json +145 -0
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/add_relationship_constraints.ejs +81 -0
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity_constraints.xml.ejs +2 -62
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +3 -60
- package/dist/generators/maven/generators/frontend-plugin/generator.js +10 -5
- package/dist/generators/maven/types.d.ts +3 -6
- package/dist/generators/project-name/command.d.ts +25 -20
- package/dist/generators/project-name/command.js +20 -4
- package/dist/generators/project-name/generator.d.ts +3 -12
- package/dist/generators/project-name/generator.js +6 -38
- package/dist/generators/react/generator.d.ts +1 -1
- package/dist/generators/react/generator.js +15 -2
- package/dist/generators/react/resources/package.json +25 -24
- package/dist/generators/react/templates/package.json.ejs +0 -3
- package/dist/generators/server/generator.d.ts +1 -7
- package/dist/generators/server/generator.js +22 -50
- package/dist/generators/server/resources/Dockerfile +12 -12
- package/dist/generators/server/resources/gradle/libs.versions.toml +10 -7
- package/dist/generators/server/resources/pom.xml +11 -11
- package/dist/generators/server/types.d.ts +8 -0
- package/dist/generators/spring-boot/cleanup.js +2 -2
- package/dist/generators/spring-boot/command.d.ts +19 -0
- package/dist/generators/spring-boot/command.js +19 -0
- package/dist/generators/spring-boot/generator.d.ts +1 -1
- package/dist/generators/spring-boot/generator.js +4 -1
- package/dist/generators/spring-boot/prompts.js +12 -12
- package/dist/generators/spring-boot/resources/spring-boot-dependencies.pom +107 -106
- package/dist/generators/spring-boot/templates/README.md.jhi.spring-boot.ejs +22 -16
- package/dist/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs +2 -46
- package/dist/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs +1 -47
- package/dist/generators/spring-boot/templates/src/main/java/_package_/Application.java.ejs +4 -1
- package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +29 -6
- package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +32 -6
- package/dist/generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs +13 -8
- package/dist/generators/spring-boot/templates/src/main/java/_package_/domain/User.java.ejs +2 -3
- package/dist/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs +8 -3
- package/dist/generators/spring-boot/templates/src/main/resources/config/application.yml.ejs +4 -2
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +8 -7
- package/dist/generators/spring-cache/generator.d.ts +2 -1
- package/dist/generators/spring-cache/generator.js +18 -0
- package/dist/generators/spring-cache/resources/gradle/libs.versions.toml +1 -1
- package/dist/generators/spring-cloud/generators/gateway/generator.js +2 -2
- package/dist/generators/spring-data-couchbase/generator.js +2 -2
- package/dist/generators/spring-data-mongodb/generator.d.ts +1 -1
- package/dist/generators/spring-data-relational/files.d.ts +1 -0
- package/dist/generators/spring-data-relational/files.js +6 -0
- package/dist/generators/spring-data-relational/generator.d.ts +2 -1
- package/dist/generators/spring-data-relational/generator.js +63 -2
- package/dist/generators/spring-data-relational/internal/dependencies.d.ts +87 -7
- package/dist/generators/spring-data-relational/internal/dependencies.js +30 -18
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_persistable.ejs +6 -0
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_reactive.ejs +1 -2
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs +8 -3
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/config/JacksonNativeConfiguration.java.ejs +98 -0
- package/dist/generators/vue/files-vue.js +4 -1
- package/dist/generators/vue/generator.d.ts +1 -1
- package/dist/generators/vue/generator.js +84 -3
- package/dist/generators/vue/resources/package.json +20 -19
- package/dist/generators/vue/support/update-languages.js +1 -1
- package/dist/generators/vue/templates/module-federation.config.cjs.ejs +55 -0
- package/dist/generators/vue/templates/package.json.ejs +11 -62
- package/dist/generators/vue/templates/src/main/webapp/app/main.ts.ejs +1 -1
- package/dist/generators/vue/templates/vite.config.mts.ejs +15 -21
- package/dist/generators/workspaces/generator.d.ts +20 -9
- package/dist/generators/workspaces/generator.js +3 -3
- package/dist/lib/application/field-types.d.ts +2 -1
- package/dist/lib/command/converter.d.ts +6 -2
- package/dist/lib/command/converter.js +4 -1
- package/dist/lib/command/load.js +1 -0
- package/dist/lib/command/lookup-commands-configs.js +9 -12
- package/dist/lib/command/support/merge-union.d.ts +17 -6
- package/dist/lib/command/types.d.ts +38 -11
- package/dist/lib/eslint/index.d.ts +6 -14
- package/dist/lib/eslint/index.js +1 -2
- package/dist/lib/index.d.ts +1 -0
- package/dist/lib/index.js +7 -3
- package/dist/lib/jdl/core/parsing/validator.js +2 -2
- package/dist/lib/jhipster/default-application-options.d.ts +83 -15
- package/dist/lib/jhipster/default-application-options.js +26 -27
- package/dist/lib/testing/get-generator.d.ts +1 -0
- package/dist/lib/testing/get-generator.js +6 -2
- package/dist/lib/testing/github-group.d.ts +6 -0
- package/dist/lib/testing/github-group.js +56 -0
- package/dist/lib/testing/github-matrix.d.ts +38 -0
- package/dist/lib/testing/github-matrix.js +72 -0
- package/dist/lib/testing/github.d.ts +1 -0
- package/dist/lib/testing/github.js +6 -2
- package/dist/lib/testing/helpers.d.ts +41 -3
- package/dist/lib/testing/helpers.js +74 -12
- package/dist/lib/testing/index.d.ts +2 -0
- package/dist/lib/testing/index.js +2 -0
- package/dist/lib/testing/support/matcher.d.ts +2 -2
- package/dist/lib/testing/support/matcher.js +3 -3
- package/dist/lib/types/application/application.d.ts +6 -1
- package/dist/lib/types/application/entity.d.ts +3 -1
- package/dist/lib/types/application/field.d.ts +16 -4
- package/dist/lib/types/application/options.d.ts +4 -0
- package/dist/lib/types/application/relationship.d.ts +1 -0
- package/dist/lib/types/application/yo-rc.d.ts +4 -0
- package/dist/lib/types/base/entity.d.ts +1 -0
- package/dist/lib/utils/logger.d.ts +1 -1
- package/dist/lib/utils/yo-rc.d.ts +27 -3
- package/package.json +33 -31
- package/dist/generators/generate-blueprint/templates/vitest.test-setup.ts.ejs +0 -6
- package/dist/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs +0 -45
|
@@ -10,17 +10,17 @@ LABEL ALIAS=jhipster-control-center
|
|
|
10
10
|
FROM jhipster/consul-config-loader:v0.4.1
|
|
11
11
|
LABEL ALIAS=consul-config-loader
|
|
12
12
|
|
|
13
|
-
FROM postgres:
|
|
13
|
+
FROM postgres:17.0
|
|
14
14
|
LABEL ALIAS=postgresql
|
|
15
15
|
|
|
16
16
|
FROM quay.io/keycloak/keycloak:25.0.1
|
|
17
17
|
LABEL ALIAS=keycloak
|
|
18
18
|
|
|
19
|
-
FROM mysql:9.0
|
|
19
|
+
FROM mysql:9.1.0
|
|
20
20
|
|
|
21
21
|
FROM mariadb:11.5.2
|
|
22
22
|
|
|
23
|
-
FROM mongo:8.0.
|
|
23
|
+
FROM mongo:8.0.3
|
|
24
24
|
LABEL ALIAS=mongodb
|
|
25
25
|
|
|
26
26
|
FROM couchbase/server:7.6.3
|
|
@@ -31,14 +31,14 @@ FROM cassandra:5.0
|
|
|
31
31
|
FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
|
|
32
32
|
LABEL ALIAS=mssql
|
|
33
33
|
|
|
34
|
-
FROM neo4j:5.
|
|
34
|
+
FROM neo4j:5.24.2
|
|
35
35
|
|
|
36
|
-
FROM hazelcast/management-center:5.
|
|
36
|
+
FROM hazelcast/management-center:5.6.0
|
|
37
37
|
LABEL ALIAS=hazelcast
|
|
38
38
|
|
|
39
|
-
FROM memcached:1.6.
|
|
39
|
+
FROM memcached:1.6.32-alpine
|
|
40
40
|
|
|
41
|
-
FROM redis:7.4.
|
|
41
|
+
FROM redis:7.4.1
|
|
42
42
|
|
|
43
43
|
FROM confluentinc/cp-kafka:7.7.1
|
|
44
44
|
LABEL ALIAS=kafka
|
|
@@ -46,16 +46,16 @@ LABEL ALIAS=kafka
|
|
|
46
46
|
FROM confluentinc/cp-zookeeper:7.7.1
|
|
47
47
|
LABEL ALIAS=zookeeper
|
|
48
48
|
|
|
49
|
-
FROM apachepulsar/pulsar:
|
|
49
|
+
FROM apachepulsar/pulsar:4.0.0
|
|
50
50
|
LABEL ALIAS=pulsar
|
|
51
51
|
|
|
52
|
-
FROM sonarqube:10.
|
|
52
|
+
FROM sonarqube:10.7.0-community
|
|
53
53
|
LABEL ALIAS=sonar
|
|
54
54
|
|
|
55
|
-
FROM docker.io/bitnami/consul:1.
|
|
55
|
+
FROM docker.io/bitnami/consul:1.20.0
|
|
56
56
|
LABEL ALIAS=consul
|
|
57
57
|
|
|
58
|
-
FROM prom/prometheus:v2.
|
|
58
|
+
FROM prom/prometheus:v2.55.0
|
|
59
59
|
LABEL ALIAS=prometheus
|
|
60
60
|
|
|
61
61
|
FROM prom/alertmanager:v0.27.0
|
|
@@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager
|
|
|
64
64
|
FROM quay.io/coreos/prometheus-operator:v0.42.1
|
|
65
65
|
LABEL ALIAS=prometheus-operator
|
|
66
66
|
|
|
67
|
-
FROM grafana/grafana:11.
|
|
67
|
+
FROM grafana/grafana:11.3.0
|
|
68
68
|
LABEL ALIAS=grafana
|
|
69
69
|
|
|
70
70
|
FROM quay.io/coreos/grafana-watcher:v0.0.8
|
|
@@ -7,23 +7,26 @@ feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', v
|
|
|
7
7
|
|
|
8
8
|
# Cucumber
|
|
9
9
|
testng = { module = 'org.testng:testng', version = '7.10.2' }
|
|
10
|
-
cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.
|
|
10
|
+
cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.20.1' }
|
|
11
11
|
|
|
12
|
-
mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.
|
|
12
|
+
mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.5.0' }
|
|
13
13
|
|
|
14
|
-
neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.13.
|
|
14
|
+
neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.13.3' }
|
|
15
15
|
|
|
16
16
|
# Cassandra
|
|
17
17
|
lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' }
|
|
18
18
|
|
|
19
|
+
# Couchbase
|
|
20
|
+
couchmove = { module = 'com.github.differentway:couchmove', version = '3.4.1' }
|
|
21
|
+
|
|
19
22
|
# jib
|
|
20
|
-
jib-maven-plugin = { module = 'com.google.cloud.tools:jib-maven-plugin', version = '3.4.
|
|
23
|
+
jib-maven-plugin = { module = 'com.google.cloud.tools:jib-maven-plugin', version = '3.4.4' }
|
|
21
24
|
jib-spring-boot-extension-maven = { module = 'com.google.cloud.tools:jib-spring-boot-extension-maven', version = '0.1.0' }
|
|
22
25
|
|
|
23
26
|
[plugins]
|
|
24
27
|
gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.2' }
|
|
25
28
|
|
|
26
|
-
node-gradle = { id = 'com.github.node-gradle.node', version = '7.0
|
|
29
|
+
node-gradle = { id = 'com.github.node-gradle.node', version = '7.1.0' }
|
|
27
30
|
|
|
28
31
|
gradle-liquibase = { id = 'org.liquibase.gradle', version = '3.0.1' }
|
|
29
32
|
|
|
@@ -37,6 +40,6 @@ gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.18.1' }
|
|
|
37
40
|
|
|
38
41
|
common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0.2' }
|
|
39
42
|
|
|
40
|
-
gatling-gradle = { id = 'io.gatling.gradle', version = '3.12.0' }
|
|
43
|
+
gatling-gradle = { id = 'io.gatling.gradle', version = '3.12.0.3' }
|
|
41
44
|
|
|
42
|
-
gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.
|
|
45
|
+
gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.9.0' }
|
|
@@ -9,37 +9,37 @@
|
|
|
9
9
|
<properties>
|
|
10
10
|
<!-- Dependency versions -->
|
|
11
11
|
<archunit-junit5.version>1.3.0</archunit-junit5.version>
|
|
12
|
-
<blockhound-junit-platform.version>1.0.
|
|
12
|
+
<blockhound-junit-platform.version>1.0.10.RELEASE</blockhound-junit-platform.version>
|
|
13
13
|
<commons-beanutils.version>1.9.4</commons-beanutils.version>
|
|
14
14
|
<gatling.version>3.12.0</gatling.version>
|
|
15
15
|
<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
|
|
16
16
|
<mapstruct.version>1.6.2</mapstruct.version>
|
|
17
|
-
<micrometer-context-propagation.version>1.1.
|
|
17
|
+
<micrometer-context-propagation.version>1.1.2</micrometer-context-propagation.version>
|
|
18
18
|
<picocli.version>4.7.6</picocli.version>
|
|
19
19
|
|
|
20
20
|
<!-- Plugin versions -->
|
|
21
|
-
<checkstyle.version>10.
|
|
21
|
+
<checkstyle.version>10.19.0</checkstyle.version>
|
|
22
22
|
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
|
|
23
|
-
<frontend-maven-plugin.version>1.15.
|
|
24
|
-
<gatling-maven-plugin.version>4.
|
|
23
|
+
<frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
|
|
24
|
+
<gatling-maven-plugin.version>4.10.1</gatling-maven-plugin.version>
|
|
25
25
|
<git-commit-id-maven-plugin.version>9.0.1</git-commit-id-maven-plugin.version>
|
|
26
26
|
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
|
|
27
27
|
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
|
|
28
28
|
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
|
|
29
|
-
<maven-checkstyle-plugin.version>3.
|
|
29
|
+
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
|
|
30
30
|
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
|
|
31
31
|
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
|
|
32
32
|
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
|
|
33
|
-
<maven-failsafe-plugin.version>3.5.
|
|
33
|
+
<maven-failsafe-plugin.version>3.5.1</maven-failsafe-plugin.version>
|
|
34
34
|
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
|
|
35
|
-
<maven-javadoc-plugin.version>3.10.
|
|
35
|
+
<maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
|
|
36
36
|
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
|
|
37
|
-
<maven-site-plugin.version>3.
|
|
38
|
-
<maven-surefire-plugin.version>3.5.
|
|
37
|
+
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
|
|
38
|
+
<maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
|
|
39
39
|
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
|
|
40
40
|
<modernizer-maven-plugin.version>2.9.0</modernizer-maven-plugin.version>
|
|
41
41
|
<nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
|
|
42
|
-
<openapi-generator-maven-plugin.version>7.
|
|
42
|
+
<openapi-generator-maven-plugin.version>7.9.0</openapi-generator-maven-plugin.version>
|
|
43
43
|
<properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
|
|
44
44
|
<sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
|
|
45
45
|
<spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { PackageJson } from 'type-fest';
|
|
1
2
|
import type { JavaApplication, JavaSourceType } from '../java/types.js';
|
|
2
3
|
import type { GradleSourceType } from '../gradle/types.js';
|
|
3
4
|
import type { MavenSourceType } from '../maven/types.js';
|
|
@@ -33,6 +34,12 @@ export type SpringBootSourceType = JavaSourceType &
|
|
|
33
34
|
addAllowBlockingCallsInside?({ classPath, method }: { classPath: string; method: string }): void;
|
|
34
35
|
addApplicationPropertiesContent?(content: ApplicationPropertiesNeedles): void;
|
|
35
36
|
addApplicationPropertiesProperty?({ propertyName, propertyType }: { propertyName: string; propertyType: string }): void;
|
|
37
|
+
addNativeHint?(hints: {
|
|
38
|
+
advanced?: string[];
|
|
39
|
+
declaredConstructors?: string[];
|
|
40
|
+
resources?: string[];
|
|
41
|
+
publicConstructors?: string[];
|
|
42
|
+
}): void;
|
|
36
43
|
};
|
|
37
44
|
|
|
38
45
|
type CacheProviderApplication = OptionWithDerivedProperties<
|
|
@@ -117,6 +124,7 @@ export type SpringBootApplication = JavaApplication &
|
|
|
117
124
|
SearchEngine &
|
|
118
125
|
DatabaseTypeApplication &
|
|
119
126
|
GatewayApplication & {
|
|
127
|
+
jhipsterPackageJson: PackageJson;
|
|
120
128
|
jhipsterDependenciesVersion: string;
|
|
121
129
|
springBootDependencies: Record<string, string>;
|
|
122
130
|
dockerContainers: Record<string, string>;
|
|
@@ -23,7 +23,7 @@ import cleanupOauth2 from './cleanup-oauth2.js';
|
|
|
23
23
|
* Removes server files that where generated in previous JHipster versions and therefore
|
|
24
24
|
* need to be removed.
|
|
25
25
|
*/
|
|
26
|
-
export default asWritingTask(function cleanupTask(taskParam) {
|
|
26
|
+
export default asWritingTask(async function cleanupTask(taskParam) {
|
|
27
27
|
const { application, control } = taskParam;
|
|
28
28
|
if (application.authenticationTypeOauth2) {
|
|
29
29
|
cleanupOauth2.call(this, taskParam);
|
|
@@ -200,7 +200,7 @@ export default asWritingTask(function cleanupTask(taskParam) {
|
|
|
200
200
|
if (this.isJhipsterVersionLessThan('8.4.0')) {
|
|
201
201
|
this.removeFile(`${application.javaPackageSrcDir}config/LocaleConfiguration.java`);
|
|
202
202
|
}
|
|
203
|
-
control.cleanupFiles({
|
|
203
|
+
await control.cleanupFiles({
|
|
204
204
|
'8.6.1': [[application.authenticationTypeOauth2, `${application.javaPackageSrcDir}security/oauth2/JwtGrantedAuthorityConverter.java`]],
|
|
205
205
|
});
|
|
206
206
|
});
|
|
@@ -55,6 +55,14 @@ declare const command: {
|
|
|
55
55
|
}];
|
|
56
56
|
readonly scope: "storage";
|
|
57
57
|
};
|
|
58
|
+
readonly jwtSecretKey: {
|
|
59
|
+
readonly cli: {
|
|
60
|
+
readonly type: StringConstructor;
|
|
61
|
+
readonly env: "JHI_JWT_SECRET_KEY";
|
|
62
|
+
readonly hide: true;
|
|
63
|
+
};
|
|
64
|
+
readonly scope: "storage";
|
|
65
|
+
};
|
|
58
66
|
readonly authenticationType: {
|
|
59
67
|
readonly cli: {
|
|
60
68
|
readonly name: "auth";
|
|
@@ -159,6 +167,17 @@ declare const command: {
|
|
|
159
167
|
readonly choices: readonly ["liquibase"];
|
|
160
168
|
readonly scope: "storage";
|
|
161
169
|
};
|
|
170
|
+
readonly graalvmSupport: {
|
|
171
|
+
readonly description: "Experimental GraalVM Native support";
|
|
172
|
+
readonly cli: {
|
|
173
|
+
readonly type: BooleanConstructor;
|
|
174
|
+
};
|
|
175
|
+
readonly jdl: {
|
|
176
|
+
readonly type: "boolean";
|
|
177
|
+
readonly tokenType: "BOOLEAN";
|
|
178
|
+
};
|
|
179
|
+
readonly scope: "storage";
|
|
180
|
+
};
|
|
162
181
|
};
|
|
163
182
|
readonly import: readonly ["java", "liquibase", "spring-data-relational", "jhipster:spring-cloud:gateway"];
|
|
164
183
|
};
|
|
@@ -79,6 +79,14 @@ const command = {
|
|
|
79
79
|
],
|
|
80
80
|
scope: 'storage',
|
|
81
81
|
},
|
|
82
|
+
jwtSecretKey: {
|
|
83
|
+
cli: {
|
|
84
|
+
type: String,
|
|
85
|
+
env: 'JHI_JWT_SECRET_KEY',
|
|
86
|
+
hide: true,
|
|
87
|
+
},
|
|
88
|
+
scope: 'storage',
|
|
89
|
+
},
|
|
82
90
|
authenticationType: {
|
|
83
91
|
cli: {
|
|
84
92
|
name: 'auth',
|
|
@@ -206,6 +214,17 @@ const command = {
|
|
|
206
214
|
choices: ['liquibase'],
|
|
207
215
|
scope: 'storage',
|
|
208
216
|
},
|
|
217
|
+
graalvmSupport: {
|
|
218
|
+
description: 'Experimental GraalVM Native support',
|
|
219
|
+
cli: {
|
|
220
|
+
type: Boolean,
|
|
221
|
+
},
|
|
222
|
+
jdl: {
|
|
223
|
+
type: 'boolean',
|
|
224
|
+
tokenType: 'BOOLEAN',
|
|
225
|
+
},
|
|
226
|
+
scope: 'storage',
|
|
227
|
+
},
|
|
209
228
|
},
|
|
210
229
|
import: [GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL, 'jhipster:spring-cloud:gateway'],
|
|
211
230
|
};
|
|
@@ -6,7 +6,7 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
|
|
|
6
6
|
get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "checks" | "feignMigration">;
|
|
7
7
|
get composing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "composing">;
|
|
8
8
|
get composingComponent(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "composing" | "composeLanguages">;
|
|
9
|
-
get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareForTemplates" | "
|
|
9
|
+
get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareForTemplates" | "prepare" | "checksWebsocket" | "loadSpringBootBom" | "registerSpringFactory" | "addSpringIntegrationTest" | "addLogNeedles" | "addApplicationPropertiesNeedles">;
|
|
10
10
|
get preparingEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareEntity">;
|
|
11
11
|
get preparingEachEntityField(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityFieldTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareEntity">;
|
|
12
12
|
get preparingEachEntityRelationship(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityRelationshipTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareEntity" | "checkUserRelationships" | "checkDtoRelationships">;
|
|
@@ -95,10 +95,13 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
|
|
|
95
95
|
get composing() {
|
|
96
96
|
return this.asComposingTaskGroup({
|
|
97
97
|
async composing() {
|
|
98
|
-
const { applicationType, databaseType, messageBroker, searchEngine, websocket, cacheProvider, testFrameworks, feignClient, enableSwaggerCodegen, } = this.jhipsterConfigWithDefaults;
|
|
98
|
+
const { applicationType, databaseType, graalvmSupport, messageBroker, searchEngine, websocket, cacheProvider, testFrameworks, feignClient, enableSwaggerCodegen, } = this.jhipsterConfigWithDefaults;
|
|
99
99
|
await this.composeWithJHipster(GENERATOR_DOCKER);
|
|
100
100
|
await this.composeWithJHipster('jhipster:java:jib');
|
|
101
101
|
await this.composeWithJHipster('jhipster:java:code-quality');
|
|
102
|
+
if (graalvmSupport) {
|
|
103
|
+
await this.composeWithJHipster('jhipster:java:graalvm');
|
|
104
|
+
}
|
|
102
105
|
if (enableSwaggerCodegen) {
|
|
103
106
|
await this.composeWithJHipster('jhipster:java:openapi-generator');
|
|
104
107
|
}
|
|
@@ -25,7 +25,7 @@ const { GATEWAY, MONOLITH } = applicationTypes;
|
|
|
25
25
|
const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS } = cacheTypes;
|
|
26
26
|
const { OAUTH2 } = authenticationTypes;
|
|
27
27
|
const { CASSANDRA, H2_DISK, H2_MEMORY, MONGODB, NEO4J, SQL, COUCHBASE } = databaseTypes;
|
|
28
|
-
const {
|
|
28
|
+
const { SERVICE_DISCOVERY_TYPE, WEBSOCKET, SEARCH_ENGINE, ENABLE_SWAGGER_CODEGEN } = OptionNames;
|
|
29
29
|
const NO_DATABASE = databaseTypes.NO;
|
|
30
30
|
const NO_CACHE_PROVIDER = cacheTypes.NO;
|
|
31
31
|
const { GATLING, CUCUMBER } = testFrameworkTypes;
|
|
@@ -49,15 +49,15 @@ const getOptionFromArray = (array, option) => {
|
|
|
49
49
|
export async function askForServerSideOpts({ control }) {
|
|
50
50
|
if (control.existingProject && !this.options.askAnswered)
|
|
51
51
|
return;
|
|
52
|
-
const { applicationType } = this.jhipsterConfigWithDefaults;
|
|
52
|
+
const { applicationType, authenticationType, reactive } = this.jhipsterConfigWithDefaults;
|
|
53
53
|
await this.prompt([
|
|
54
54
|
{
|
|
55
55
|
type: 'list',
|
|
56
|
-
name:
|
|
56
|
+
name: 'databaseType',
|
|
57
57
|
message: `Which ${chalk.yellow('*type*')} of database would you like to use?`,
|
|
58
|
-
choices:
|
|
58
|
+
choices: () => {
|
|
59
59
|
const opts = [];
|
|
60
|
-
if (!
|
|
60
|
+
if (!reactive) {
|
|
61
61
|
opts.push({
|
|
62
62
|
value: SQL,
|
|
63
63
|
name: 'SQL (H2, PostgreSQL, MySQL, MariaDB, Oracle, MSSQL)',
|
|
@@ -73,7 +73,7 @@ export async function askForServerSideOpts({ control }) {
|
|
|
73
73
|
value: MONGODB,
|
|
74
74
|
name: 'MongoDB',
|
|
75
75
|
});
|
|
76
|
-
if (
|
|
76
|
+
if (authenticationType !== OAUTH2) {
|
|
77
77
|
opts.push({
|
|
78
78
|
value: CASSANDRA,
|
|
79
79
|
name: 'Cassandra',
|
|
@@ -98,15 +98,15 @@ export async function askForServerSideOpts({ control }) {
|
|
|
98
98
|
{
|
|
99
99
|
when: response => response.databaseType === SQL,
|
|
100
100
|
type: 'list',
|
|
101
|
-
name:
|
|
101
|
+
name: 'prodDatabaseType',
|
|
102
102
|
message: `Which ${chalk.yellow('*production*')} database would you like to use?`,
|
|
103
|
-
choices:
|
|
103
|
+
choices: reactive ? R2DBC_DB_OPTIONS : SQL_DB_OPTIONS,
|
|
104
104
|
default: this.jhipsterConfigWithDefaults.prodDatabaseType,
|
|
105
105
|
},
|
|
106
106
|
{
|
|
107
107
|
when: response => response.databaseType === SQL,
|
|
108
108
|
type: 'list',
|
|
109
|
-
name:
|
|
109
|
+
name: 'devDatabaseType',
|
|
110
110
|
message: `Which ${chalk.yellow('*development*')} database would you like to use?`,
|
|
111
111
|
choices: response => [SQL_DB_OPTIONS.find(it => it.value === response.prodDatabaseType)].concat([
|
|
112
112
|
{
|
|
@@ -121,9 +121,9 @@ export async function askForServerSideOpts({ control }) {
|
|
|
121
121
|
default: this.jhipsterConfigWithDefaults.devDatabaseType,
|
|
122
122
|
},
|
|
123
123
|
{
|
|
124
|
-
when:
|
|
124
|
+
when: !reactive,
|
|
125
125
|
type: 'list',
|
|
126
|
-
name:
|
|
126
|
+
name: 'cacheProvider',
|
|
127
127
|
message: 'Which cache do you want to use? (Spring cache abstraction)',
|
|
128
128
|
choices: [
|
|
129
129
|
{
|
|
@@ -160,7 +160,7 @@ export async function askForServerSideOpts({ control }) {
|
|
|
160
160
|
{
|
|
161
161
|
when: answers => ((answers.cacheProvider !== NO_CACHE_PROVIDER && answers.cacheProvider !== MEMCACHED) || applicationType === GATEWAY) &&
|
|
162
162
|
answers.databaseType === SQL &&
|
|
163
|
-
!
|
|
163
|
+
!reactive,
|
|
164
164
|
type: 'confirm',
|
|
165
165
|
name: 'enableHibernateCache',
|
|
166
166
|
message: 'Do you want to use Hibernate 2nd level cache?',
|