generator-jhipster 7.3.0 → 7.5.0
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/cli/import-jdl.js +3 -2
- package/cli/jhipster-command.js +2 -2
- package/cli/program.js +32 -29
- package/generators/app/index.js +46 -27
- package/generators/aws/index.js +8 -8
- package/generators/aws/lib/eb.js +1 -1
- package/generators/azure-app-service/index.js +16 -9
- package/generators/azure-app-service/templates/github/workflows/azure-app-service.yml.ejs +2 -2
- package/generators/azure-spring-cloud/index.js +16 -9
- package/generators/azure-spring-cloud/templates/github/workflows/azure-spring-cloud.yml.ejs +2 -2
- package/generators/bootstrap/index.js +57 -62
- package/generators/ci-cd/index.js +11 -8
- package/generators/ci-cd/templates/github-actions.yml.ejs +1 -1
- package/generators/ci-cd/templates/travis.yml.ejs +9 -4
- package/generators/cleanup.js +27 -171
- package/generators/client/files-angular.js +12 -1
- package/generators/client/files-common.js +6 -2
- package/generators/client/files-react.js +13 -2
- package/generators/client/files-vue.js +59 -7
- package/generators/client/index.js +46 -32
- package/generators/client/needle-api/needle-client-angular.js +1 -1
- package/generators/client/needle-api/needle-client-vue.js +57 -7
- package/generators/client/templates/angular/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/angular/angular.json.ejs +5 -0
- package/generators/client/templates/angular/jest.conf.js.ejs +2 -0
- package/generators/client/templates/angular/package.json +29 -29
- package/generators/client/templates/angular/package.json.ejs +3 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +52 -54
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs +65 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +35 -37
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs +78 -80
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.service.spec.ts.ejs +41 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +73 -75
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs +62 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +44 -46
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs +61 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs +122 -123
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.service.spec.ts.ejs +66 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +75 -77
- package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +80 -80
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +48 -50
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +45 -47
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +66 -0
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +99 -101
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +61 -63
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +28 -30
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +35 -37
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +40 -42
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +89 -91
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +81 -83
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +8 -8
- package/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs +14 -3
- package/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs +8 -29
- package/generators/client/templates/angular/src/main/webapp/app/config/datepicker-adapter.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/config/dayjs.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +14 -9
- package/generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker.service.ts.ejs +6 -6
- package/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/entities/entity-navbar-items.ts.ejs +29 -0
- package/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs +106 -98
- package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +166 -168
- package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +20 -0
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +74 -70
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +41 -2
- package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +27 -29
- package/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs +114 -115
- package/generators/client/templates/angular/src/main/webapp/app/login/login.component.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs +132 -134
- package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +29 -31
- package/generators/client/templates/angular/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs +6 -6
- package/generators/client/templates/angular/src/main/webapp/app/shared/language/translation.module.ts.ejs +83 -0
- package/generators/client/templates/angular/src/main/webapp/declarations.d.ts.ejs +16 -2
- package/generators/client/templates/angular/tsconfig.json.ejs +2 -0
- package/generators/client/templates/angular/tsconfig.spec.json.ejs +0 -1
- package/generators/client/templates/angular/webpack/proxy.conf.js.ejs +0 -2
- package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +0 -16
- package/generators/client/templates/angular/webpack/webpack.microfrontend.js.ejs +12 -5
- package/generators/client/templates/common/package.json +6 -6
- package/generators/client/templates/common/src/main/webapp/robots.txt.ejs +0 -1
- package/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs +86 -56
- package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +56 -0
- package/generators/client/templates/react/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/react/package.json +54 -53
- package/generators/client/templates/react/package.json.ejs +6 -1
- package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.spec.ts.ejs +3 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +6 -6
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +8 -8
- package/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.scss.ejs +9 -0
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +3 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +7 -7
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs +1 -1
- package/generators/client/templates/react/webpack/webpack.dev.js.ejs +17 -3
- package/generators/client/templates/react/webpack/webpack.prod.js.ejs +13 -1
- package/generators/client/templates/vue/.eslintrc.js.ejs +8 -5
- package/generators/client/templates/vue/package.json +40 -49
- package/generators/client/templates/vue/package.json.ejs +13 -17
- package/generators/client/templates/vue/src/main/webapp/app/account/account.service.ts.ejs +23 -12
- package/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.vue.ejs +7 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.vue.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/constants.ts.ejs +16 -6
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +27 -8
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +6 -0
- package/generators/client/templates/vue/src/main/webapp/app/declarations.d.ts.ejs +41 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.component.ts.ejs +34 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.vue.ejs +13 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.component.ts.ejs +20 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.vue.ejs +5 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/user/{user.oauth2.service.ts.ejs → user.service.ts.ejs} +1 -1
- package/generators/client/templates/vue/{webpack/utils.js.ejs → src/main/webapp/app/index.ts.ejs} +1 -12
- package/generators/client/templates/vue/src/main/webapp/app/locale/translation.service.ts.ejs +26 -9
- package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +20 -18
- package/generators/client/templates/vue/src/main/webapp/app/router/entities.ts.ejs +45 -3
- package/generators/client/templates/vue/src/main/webapp/app/router/index.ts.ejs +19 -3
- package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +0 -2
- package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +3 -1
- package/generators/client/templates/vue/src/main/webapp/app/shims-vue.d.ts.ejs +17 -3
- package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +25 -10
- package/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs +2 -2
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs +6 -4
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs +4 -2
- package/generators/client/templates/vue/src/test/javascript/spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs +10 -4
- package/generators/client/templates/vue/src/test/javascript/spec/app/entities/entities-menu.spec.ts.ejs +52 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.component.ts.ejs +4 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.vue.ejs +7 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-router.ts.ejs +1 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/shared/config/axios-interceptor.spec.ts.ejs +0 -1
- package/generators/client/templates/vue/tsconfig.json.ejs +6 -10
- package/generators/client/templates/vue/tsconfig.spec.json.ejs +37 -0
- package/generators/client/templates/vue/webpack/config.js.ejs +50 -0
- package/generators/client/templates/vue/webpack/vue.utils.js.ejs +33 -32
- package/generators/client/templates/vue/webpack/webpack.common.js.ejs +150 -126
- package/generators/client/templates/vue/webpack/webpack.dev.js.ejs +19 -76
- package/generators/client/templates/vue/webpack/webpack.microfrontend.js.jhi.vue.ejs +77 -0
- package/generators/client/templates/vue/webpack/webpack.prod.js.ejs +5 -41
- package/generators/cloudfoundry/index.js +9 -9
- package/generators/common/index.js +12 -10
- package/generators/common/templates/.prettierrc.ejs +1 -1
- package/generators/common/templates/README.md.jhi.ejs +19 -0
- package/generators/common/templates/package.json +4 -4
- package/generators/cypress/index.js +12 -9
- package/generators/cypress/templates/cypress.json.ejs +16 -2
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/login-page.spec.ts.ejs +3 -14
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/password-page.spec.ts.ejs +33 -39
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/register-page.spec.ts.ejs +52 -62
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/reset-password-page.spec.ts.ejs +2 -10
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs +25 -34
- package/generators/cypress/templates/src/test/javascript/cypress/integration/administration/administration.spec.ts.ejs +1 -22
- package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +67 -7
- package/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/support/index.ts.ejs +1 -6
- package/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +8 -8
- package/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs +0 -9
- package/generators/database-changelog/index.js +33 -22
- package/generators/database-changelog-liquibase/index.js +12 -8
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +1 -1
- package/generators/docker-compose/index.js +11 -12
- package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +1 -1
- package/generators/entities/index.js +35 -26
- package/generators/entities-client/index.js +10 -7
- package/generators/entity/index.js +81 -32
- package/generators/entity-client/files.js +7 -16
- package/generators/entity-client/index.js +22 -12
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs +42 -44
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs +58 -60
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs +1 -35
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.model.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +4 -4
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs +110 -112
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +9 -2
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs +8 -8
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs +8 -8
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs +8 -8
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs +15 -6
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs +203 -198
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +5 -5
- package/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs +1 -1
- package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +264 -127
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +17 -14
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs +5 -4
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +11 -13
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs +32 -25
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.vue.ejs +6 -9
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.component.ts.ejs +2 -1
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs +1 -1
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.service.ts.ejs +2 -6
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs +10 -7
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs +5 -1
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs +1 -1
- package/generators/entity-i18n/index.js +7 -4
- package/generators/entity-server/files.js +14 -0
- package/generators/entity-server/index.js +12 -8
- package/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/common/search_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +9 -8
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +16 -29
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +3 -3
- package/generators/entity-server/templates/src/main/java/package/repository/EntitySqlHelper_reactive.java.ejs +46 -0
- package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +18 -2
- package/generators/entity-server/templates/src/main/java/package/repository/search/SortToFieldSortBuilderConverter.java.ejs +24 -0
- package/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs +8 -6
- package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +5 -1
- package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +41 -43
- package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +3 -3
- package/generators/gae/index.js +10 -10
- package/generators/generator-base-blueprint.js +14 -46
- package/generators/generator-base-private.js +44 -23
- package/generators/generator-base.js +58 -18
- package/generators/generator-constants.js +30 -23
- package/generators/generator-transforms.js +39 -27
- package/generators/heroku/index.js +14 -33
- package/generators/init/constants.cjs +1 -1
- package/generators/java/constants.cjs +1 -1
- package/generators/kubernetes/files.js +3 -0
- package/generators/kubernetes/index.js +10 -10
- package/generators/kubernetes/templates/db/couchbase.yml.ejs +1 -1
- package/generators/kubernetes/templates/deployment.yml.ejs +8 -3
- package/generators/kubernetes/templates/istio/destination-rule.yml.ejs +1 -1
- package/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs +10 -8
- package/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway.yml.ejs +7 -5
- package/generators/kubernetes/templates/secret/couchbase-secret.yml.ejs +9 -0
- package/generators/kubernetes-base.js +1 -0
- package/generators/kubernetes-helm/files.js +3 -8
- package/generators/kubernetes-helm/index.js +10 -10
- package/generators/kubernetes-helm/templates/README-KUBERNETES-HELM.md.ejs +0 -1
- package/generators/kubernetes-helm/templates/app/Chart.yml.ejs +5 -0
- package/generators/kubernetes-helm/templates/app/helpers.tpl.ejs +0 -11
- package/generators/kubernetes-helm/templates/app/requirements.yml.ejs +5 -0
- package/generators/kubernetes-helm/templates/app/values.yml.ejs +68 -5
- package/generators/kubernetes-helm/templates/csvc/Chart.yml.ejs +1 -1
- package/generators/kubernetes-helm/templates/csvc/requirements.yml.ejs +1 -1
- package/generators/kubernetes-knative/index.js +10 -10
- package/generators/kubernetes-knative/templates/istio/gateway.yml.ejs +6 -4
- package/generators/kubernetes-knative/templates/service.yml.ejs +1 -1
- package/generators/languages/index.js +13 -13
- package/generators/languages/templates/src/main/webapp/i18n/vi/login.json +1 -1
- package/generators/openapi-client/index.js +13 -10
- package/generators/openshift/index.js +10 -11
- package/generators/openshift/templates/deployment.yml.ejs +1 -1
- package/generators/page/index.js +12 -10
- package/generators/server/__snapshots__/generator.spec.mjs.snap +28 -15
- package/generators/server/cleanup.js +151 -0
- package/generators/server/files-sql.js +52 -0
- package/generators/server/files.js +31 -14
- package/generators/server/index.js +86 -33
- package/generators/server/templates/build.gradle.ejs +231 -189
- package/generators/server/templates/gradle.properties.ejs +12 -12
- package/generators/server/templates/npmw +8 -6
- package/generators/server/templates/npmw.cmd +13 -8
- package/generators/server/templates/pom.xml.ejs +425 -217
- package/generators/server/templates/sql/reactive/src/main/java/package/repository/UserSqlHelper.java.ejs +48 -0
- package/generators/server/templates/src/main/docker/app.yml.ejs +1 -1
- package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs +2 -2
- package/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs +3 -2
- package/generators/server/templates/src/main/java/package/config/OpenApiConfiguration.java.ejs +17 -54
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +5 -5
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +4 -6
- package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +0 -3
- package/generators/server/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.ejs +19 -9
- package/generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs +68 -0
- package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs +2 -2
- package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +0 -25
- package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +31 -4
- package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +23 -11
- package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +16 -8
- package/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs +6 -6
- package/generators/server/templates/src/main/java/package/web/filter/ModifyServersOpenApiFilter.java.ejs +3 -2
- package/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs +2 -2
- package/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs +2 -2
- package/generators/server/templates/src/main/resources/config/application.yml.ejs +22 -8
- package/generators/server/templates/src/main/resources/logback-spring.xml.ejs +1 -2
- package/generators/server/templates/src/main/resources/static/microservices_index.html.ejs +1 -1
- package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs +2 -6
- package/generators/server/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.ejs +2 -3
- package/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs +41 -6
- package/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs +113 -0
- package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +6 -1
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderSecurityMetersTests.java.ejs +198 -0
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs +13 -3
- package/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs +17 -3
- package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +63 -0
- package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs +1 -1
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +2 -3
- package/generators/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.ejs +9 -0
- package/generators/server/templates/src/test/resources/junit-platform.properties.ejs +2 -0
- package/generators/server/templates/src/test/resources/logback.xml.ejs +1 -1
- package/generators/server/templates/src/test/{features → resources/package/features}/gitkeep +0 -0
- package/generators/server/templates/src/test/{features → resources/package/features}/user/user.feature.ejs +0 -0
- package/generators/spring-controller/index.js +9 -7
- package/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs +1 -1
- package/generators/spring-service/index.js +10 -7
- package/generators/upgrade/index.js +4 -5
- package/generators/utils.js +2 -2
- package/generators/workspaces/index.js +16 -7
- package/jdl/jhipster/default-application-options.js +9 -7
- package/package.json +22 -22
- package/utils/entity.js +17 -4
- package/utils/field.js +11 -1
- package/utils/multi-step-transform/index.js +8 -8
- package/generators/client/templates/react/.npmrc.ejs +0 -1
- package/generators/client/templates/vue/webpack/dev.env.js.ejs +0 -17
- package/generators/client/templates/vue/webpack/env.js.ejs +0 -67
- package/generators/client/templates/vue/webpack/loader.conf.js.ejs +0 -20
- package/generators/client/templates/vue/webpack/prod.env.js.ejs +0 -15
- package/generators/server/templates/src/main/java/package/config/apidocs/GatewaySwaggerResourcesProvider.java.ejs +0 -91
- package/generators/server/templates/src/test/java/package/config/apidocs/GatewaySwaggerResourcesProviderTest.java.ejs +0 -79
- package/generators/server/templates/src/test/resources/cucumber.properties.ejs +0 -1
|
@@ -126,13 +126,13 @@
|
|
|
126
126
|
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
|
|
127
127
|
<cassandra-driver.version>4.11.3</cassandra-driver.version>
|
|
128
128
|
<%_ } _%>
|
|
129
|
-
<archunit-junit5.version>0.
|
|
129
|
+
<archunit-junit5.version>0.22.0</archunit-junit5.version>
|
|
130
130
|
<mapstruct.version>1.4.2.Final</mapstruct.version>
|
|
131
131
|
<%_ if (enableSwaggerCodegen) { _%>
|
|
132
132
|
<jackson-databind-nullable.version><%= JACKSON_DATABIND_NULLABLE_VERSION %></jackson-databind-nullable.version>
|
|
133
133
|
<%_ } _%>
|
|
134
134
|
<%_ if (cacheProviderCaffeine) { _%>
|
|
135
|
-
<caffeine.version>3.0.
|
|
135
|
+
<caffeine.version>3.0.5</caffeine.version>
|
|
136
136
|
<typesafe.version>1.4.1</typesafe.version>
|
|
137
137
|
<%_ } _%>
|
|
138
138
|
<%_ if (databaseTypeNeo4j) { _%>
|
|
@@ -151,10 +151,10 @@
|
|
|
151
151
|
<maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
|
|
152
152
|
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
|
|
153
153
|
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
|
|
154
|
-
<maven-war-plugin.version>3.3.
|
|
154
|
+
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
|
|
155
155
|
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
|
|
156
|
-
<checkstyle.version>9.
|
|
157
|
-
<nohttp-checkstyle.version>0.0.
|
|
156
|
+
<checkstyle.version>9.2</checkstyle.version>
|
|
157
|
+
<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
|
|
158
158
|
<%_ if (!skipClient) { _%>
|
|
159
159
|
<frontend-maven-plugin.version>1.12.0</frontend-maven-plugin.version>
|
|
160
160
|
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
|
|
@@ -168,10 +168,10 @@
|
|
|
168
168
|
<jib-maven-plugin.architecture>amd64</jib-maven-plugin.architecture>
|
|
169
169
|
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
|
|
170
170
|
<%_ if (enableSwaggerCodegen) { _%>
|
|
171
|
-
<openapi-generator-maven-plugin.version>5.
|
|
171
|
+
<openapi-generator-maven-plugin.version>5.3.1</openapi-generator-maven-plugin.version>
|
|
172
172
|
<%_ } _%>
|
|
173
173
|
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
|
|
174
|
-
<sonar-maven-plugin.version>3.9.
|
|
174
|
+
<sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
|
|
175
175
|
<!-- jhipster-needle-maven-property -->
|
|
176
176
|
</properties>
|
|
177
177
|
|
|
@@ -246,20 +246,6 @@
|
|
|
246
246
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
|
247
247
|
<artifactId>jackson-datatype-jsr310</artifactId>
|
|
248
248
|
</dependency>
|
|
249
|
-
<%_ if (databaseTypeSql) { _%>
|
|
250
|
-
<dependency>
|
|
251
|
-
<groupId>com.h2database</groupId>
|
|
252
|
-
<artifactId>h2</artifactId>
|
|
253
|
-
<scope>test</scope>
|
|
254
|
-
</dependency>
|
|
255
|
-
<%_ if (reactive) { _%>
|
|
256
|
-
<dependency>
|
|
257
|
-
<groupId>io.r2dbc</groupId>
|
|
258
|
-
<artifactId>r2dbc-h2</artifactId>
|
|
259
|
-
<scope>test</scope>
|
|
260
|
-
</dependency>
|
|
261
|
-
<%_ } _%>
|
|
262
|
-
<%_ } _%>
|
|
263
249
|
<%_ if (cacheProviderHazelcast) { _%>
|
|
264
250
|
<dependency>
|
|
265
251
|
<groupId>com.hazelcast</groupId>
|
|
@@ -328,16 +314,12 @@
|
|
|
328
314
|
</dependency>
|
|
329
315
|
<%_ } _%>
|
|
330
316
|
<dependency>
|
|
331
|
-
<groupId>
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
<
|
|
336
|
-
|
|
337
|
-
</dependency>
|
|
338
|
-
<dependency>
|
|
339
|
-
<groupId>io.springfox</groupId>
|
|
340
|
-
<artifactId>springfox-bean-validators</artifactId>
|
|
317
|
+
<groupId>org.springdoc</groupId>
|
|
318
|
+
<%_ if (reactive) { _%>
|
|
319
|
+
<artifactId>springdoc-openapi-webflux-core</artifactId>
|
|
320
|
+
<%_ } else { _%>
|
|
321
|
+
<artifactId>springdoc-openapi-webmvc-core</artifactId>
|
|
322
|
+
<%_ } _%>
|
|
341
323
|
</dependency>
|
|
342
324
|
<%_ if (databaseTypeSql) { _%>
|
|
343
325
|
<dependency>
|
|
@@ -411,83 +393,17 @@
|
|
|
411
393
|
<scope>test</scope>
|
|
412
394
|
</dependency>
|
|
413
395
|
<%_ } _%>
|
|
414
|
-
<%_ if (databaseTypeSql) { _%>
|
|
415
|
-
<dependency>
|
|
416
|
-
<groupId>org.testcontainers</groupId>
|
|
417
|
-
<%_ if (prodDatabaseTypeMysql) { _%>
|
|
418
|
-
<artifactId>mysql</artifactId>
|
|
419
|
-
<%_ } else if (prodDatabaseTypeMariadb) { _%>
|
|
420
|
-
<artifactId>mariadb</artifactId>
|
|
421
|
-
<%_ } else if (prodDatabaseTypePostgres) { _%>
|
|
422
|
-
<artifactId>postgresql</artifactId>
|
|
423
|
-
<%_ } else if (prodDatabaseTypeMssql) { _%>
|
|
424
|
-
<artifactId>mssqlserver</artifactId>
|
|
425
|
-
<%_ } else if (prodDatabaseTypeOracle) { _%>
|
|
426
|
-
<artifactId>oracle-xe</artifactId>
|
|
427
|
-
<%_ } _%>
|
|
428
|
-
<scope>test</scope>
|
|
429
|
-
</dependency>
|
|
430
|
-
<%_ } _%>
|
|
431
396
|
<%_ if (cacheProviderEhCache || cacheProviderCaffeine || cacheProviderHazelcast || cacheProviderInfinispan || cacheProviderMemcached) { _%>
|
|
432
397
|
<dependency>
|
|
433
398
|
<groupId>javax.cache</groupId>
|
|
434
399
|
<artifactId>cache-api</artifactId>
|
|
435
400
|
</dependency>
|
|
436
401
|
<%_ } _%>
|
|
437
|
-
<%_ if (prodDatabaseTypeMysql) { _%>
|
|
438
|
-
<dependency>
|
|
439
|
-
<groupId>mysql</groupId>
|
|
440
|
-
<artifactId>mysql-connector-java</artifactId>
|
|
441
|
-
</dependency>
|
|
442
|
-
<%_ if (reactive) { _%>
|
|
443
|
-
<dependency>
|
|
444
|
-
<groupId>dev.miku</groupId>
|
|
445
|
-
<artifactId>r2dbc-mysql</artifactId>
|
|
446
|
-
</dependency>
|
|
447
|
-
<%_ } _%>
|
|
448
|
-
<%_ } _%>
|
|
449
|
-
<%_ if (prodDatabaseTypeMariadb) { _%>
|
|
450
|
-
<dependency>
|
|
451
|
-
<groupId>org.mariadb.jdbc</groupId>
|
|
452
|
-
<artifactId>mariadb-java-client</artifactId>
|
|
453
|
-
</dependency>
|
|
454
|
-
<%_ if (reactive) { _%>
|
|
455
|
-
<dependency>
|
|
456
|
-
<groupId>org.mariadb</groupId>
|
|
457
|
-
<artifactId>r2dbc-mariadb</artifactId>
|
|
458
|
-
</dependency>
|
|
459
|
-
<%_ } _%>
|
|
460
|
-
<%_ } _%>
|
|
461
402
|
<%_ if (databaseTypeCassandra) { _%>
|
|
462
403
|
<dependency>
|
|
463
404
|
<groupId>org.lz4</groupId>
|
|
464
405
|
<artifactId>lz4-java</artifactId>
|
|
465
406
|
</dependency>
|
|
466
|
-
<%_ } _%>
|
|
467
|
-
<%_ if (prodDatabaseTypeOracle) { _%>
|
|
468
|
-
<dependency>
|
|
469
|
-
<groupId>com.oracle.database.jdbc</groupId>
|
|
470
|
-
<artifactId>ojdbc8</artifactId>
|
|
471
|
-
</dependency>
|
|
472
|
-
<%_ } _%>
|
|
473
|
-
<%_ if (prodDatabaseTypeMssql) { _%>
|
|
474
|
-
<dependency>
|
|
475
|
-
<groupId>com.microsoft.sqlserver</groupId>
|
|
476
|
-
<artifactId>mssql-jdbc</artifactId>
|
|
477
|
-
</dependency>
|
|
478
|
-
<dependency>
|
|
479
|
-
<groupId>org.liquibase.ext</groupId>
|
|
480
|
-
<artifactId>liquibase-mssql</artifactId>
|
|
481
|
-
<version>${liquibase.version}</version>
|
|
482
|
-
</dependency>
|
|
483
|
-
<%_ if (reactive) { _%>
|
|
484
|
-
<dependency>
|
|
485
|
-
<groupId>io.r2dbc</groupId>
|
|
486
|
-
<artifactId>r2dbc-mssql</artifactId>
|
|
487
|
-
</dependency>
|
|
488
|
-
<%_ } _%>
|
|
489
|
-
<%_ } _%>
|
|
490
|
-
<%_ if (databaseTypeCassandra) { _%>
|
|
491
407
|
<dependency>
|
|
492
408
|
<groupId>org.cassandraunit</groupId>
|
|
493
409
|
<artifactId>cassandra-unit-spring</artifactId>
|
|
@@ -570,18 +486,6 @@
|
|
|
570
486
|
<groupId>com.github.differentway</groupId>
|
|
571
487
|
<artifactId>couchmove</artifactId>
|
|
572
488
|
</dependency>
|
|
573
|
-
<%_ } _%>
|
|
574
|
-
<%_ if (prodDatabaseTypePostgres) { _%>
|
|
575
|
-
<dependency>
|
|
576
|
-
<groupId>org.postgresql</groupId>
|
|
577
|
-
<artifactId>postgresql</artifactId>
|
|
578
|
-
</dependency>
|
|
579
|
-
<%_ if (reactive) { _%>
|
|
580
|
-
<dependency>
|
|
581
|
-
<groupId>io.r2dbc</groupId>
|
|
582
|
-
<artifactId>r2dbc-postgresql</artifactId>
|
|
583
|
-
</dependency>
|
|
584
|
-
<%_ } _%>
|
|
585
489
|
<%_ } _%>
|
|
586
490
|
<dependency>
|
|
587
491
|
<groupId>org.mapstruct</groupId>
|
|
@@ -680,14 +584,6 @@
|
|
|
680
584
|
<groupId>org.springframework.boot</groupId>
|
|
681
585
|
<artifactId>spring-boot-starter-test</artifactId>
|
|
682
586
|
<scope>test</scope>
|
|
683
|
-
<%_ if (cucumberTests === false) { _%>
|
|
684
|
-
<exclusions>
|
|
685
|
-
<exclusion>
|
|
686
|
-
<groupId>org.junit.vintage</groupId>
|
|
687
|
-
<artifactId>junit-vintage-engine</artifactId>
|
|
688
|
-
</exclusion>
|
|
689
|
-
</exclusions>
|
|
690
|
-
<%_ } _%>
|
|
691
587
|
</dependency>
|
|
692
588
|
<dependency>
|
|
693
589
|
<groupId>org.springframework.boot</groupId>
|
|
@@ -743,6 +639,12 @@
|
|
|
743
639
|
<groupId>org.zalando</groupId>
|
|
744
640
|
<artifactId>problem-spring-web<% if (reactive) { %>flux<%_ } _%></artifactId>
|
|
745
641
|
</dependency>
|
|
642
|
+
<%_ if (!reactive) { _%>
|
|
643
|
+
<dependency>
|
|
644
|
+
<groupId>org.springframework.boot</groupId>
|
|
645
|
+
<artifactId>spring-boot-starter-undertow</artifactId>
|
|
646
|
+
</dependency>
|
|
647
|
+
<%_ } _%>
|
|
746
648
|
<%_ if (communicationSpringWebsocket) { _%>
|
|
747
649
|
<dependency>
|
|
748
650
|
<groupId>org.springframework.boot</groupId>
|
|
@@ -759,8 +661,7 @@
|
|
|
759
661
|
<groupId>org.springframework.boot</groupId>
|
|
760
662
|
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
|
|
761
663
|
</dependency>
|
|
762
|
-
<%_ } _%>
|
|
763
|
-
<%_ if (authenticationTypeJwt) { _%>
|
|
664
|
+
<%_ } else if (authenticationTypeJwt) { _%>
|
|
764
665
|
<dependency>
|
|
765
666
|
<groupId>io.jsonwebtoken</groupId>
|
|
766
667
|
<artifactId>jjwt-api</artifactId>
|
|
@@ -803,17 +704,17 @@
|
|
|
803
704
|
<groupId>org.springframework.cloud</groupId>
|
|
804
705
|
<artifactId>spring-cloud-starter</artifactId>
|
|
805
706
|
</dependency>
|
|
806
|
-
<%_ if (reactive) { _%>
|
|
707
|
+
<%_ if (reactive) { _%>
|
|
807
708
|
<dependency>
|
|
808
709
|
<groupId>org.springframework.cloud</groupId>
|
|
809
710
|
<artifactId>spring-cloud-starter-circuitbreaker-reactor-resilience4j</artifactId>
|
|
810
711
|
</dependency>
|
|
811
|
-
<%_ } else { _%>
|
|
712
|
+
<%_ } else { _%>
|
|
812
713
|
<dependency>
|
|
813
714
|
<groupId>org.springframework.cloud</groupId>
|
|
814
715
|
<artifactId>spring-cloud-starter-circuitbreaker-resilience4j</artifactId>
|
|
815
716
|
</dependency>
|
|
816
|
-
<%_ } _%>
|
|
717
|
+
<%_ } _%>
|
|
817
718
|
<dependency>
|
|
818
719
|
<groupId>org.springframework.retry</groupId>
|
|
819
720
|
<artifactId>spring-retry</artifactId>
|
|
@@ -824,8 +725,7 @@
|
|
|
824
725
|
<groupId>org.springframework.cloud</groupId>
|
|
825
726
|
<artifactId>spring-cloud-starter-bootstrap</artifactId>
|
|
826
727
|
</dependency>
|
|
827
|
-
<%_
|
|
828
|
-
<%_ if (serviceDiscoveryEureka) { _%>
|
|
728
|
+
<%_ if (serviceDiscoveryEureka) { _%>
|
|
829
729
|
<dependency>
|
|
830
730
|
<groupId>org.springframework.cloud</groupId>
|
|
831
731
|
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
|
|
@@ -834,8 +734,8 @@
|
|
|
834
734
|
<groupId>org.springframework.cloud</groupId>
|
|
835
735
|
<artifactId>spring-cloud-starter-config</artifactId>
|
|
836
736
|
</dependency>
|
|
837
|
-
<%_ } _%>
|
|
838
|
-
<%_ if (serviceDiscoveryConsul) { _%>
|
|
737
|
+
<%_ } _%>
|
|
738
|
+
<%_ if (serviceDiscoveryConsul) { _%>
|
|
839
739
|
<dependency>
|
|
840
740
|
<groupId>org.springframework.cloud</groupId>
|
|
841
741
|
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
|
|
@@ -844,6 +744,7 @@
|
|
|
844
744
|
<groupId>org.springframework.cloud</groupId>
|
|
845
745
|
<artifactId>spring-cloud-starter-consul-config</artifactId>
|
|
846
746
|
</dependency>
|
|
747
|
+
<%_ } _%>
|
|
847
748
|
<%_ } _%>
|
|
848
749
|
<%_ if (applicationTypeGateway && authenticationTypeOauth2 && reactive) { _%>
|
|
849
750
|
<dependency>
|
|
@@ -895,7 +796,7 @@
|
|
|
895
796
|
<!-- Cucumber -->
|
|
896
797
|
<dependency>
|
|
897
798
|
<groupId>io.cucumber</groupId>
|
|
898
|
-
<artifactId>cucumber-junit</artifactId>
|
|
799
|
+
<artifactId>cucumber-junit-platform-engine</artifactId>
|
|
899
800
|
<scope>test</scope>
|
|
900
801
|
</dependency>
|
|
901
802
|
<dependency>
|
|
@@ -908,23 +809,140 @@
|
|
|
908
809
|
<artifactId>cucumber-spring</artifactId>
|
|
909
810
|
<scope>test</scope>
|
|
910
811
|
</dependency>
|
|
812
|
+
<dependency>
|
|
813
|
+
<groupId>org.junit.platform</groupId>
|
|
814
|
+
<artifactId>junit-platform-console</artifactId>
|
|
815
|
+
<scope>test</scope>
|
|
816
|
+
</dependency>
|
|
817
|
+
<dependency>
|
|
818
|
+
<groupId>org.testng</groupId>
|
|
819
|
+
<artifactId>testng</artifactId>
|
|
820
|
+
<scope>test</scope>
|
|
821
|
+
</dependency>
|
|
822
|
+
<%_ } _%>
|
|
823
|
+
<%_ if (databaseTypeSql && !devDatabaseTypeH2Any) { _%>
|
|
824
|
+
<dependency>
|
|
825
|
+
<groupId>org.testcontainers</groupId>
|
|
826
|
+
<%_ if (devDatabaseTypeMysql) { _%>
|
|
827
|
+
<artifactId>mysql</artifactId>
|
|
828
|
+
<%_ } else if (devDatabaseTypeMariadb) { _%>
|
|
829
|
+
<artifactId>mariadb</artifactId>
|
|
830
|
+
<%_ } else if (devDatabaseTypePostgres) { _%>
|
|
831
|
+
<artifactId>postgresql</artifactId>
|
|
832
|
+
<%_ } else if (devDatabaseTypeMssql) { _%>
|
|
833
|
+
<artifactId>mssqlserver</artifactId>
|
|
834
|
+
<%_ } else if (devDatabaseTypeOracle) { _%>
|
|
835
|
+
<artifactId>oracle-xe</artifactId>
|
|
836
|
+
<%_ } _%>
|
|
837
|
+
<scope>provided</scope>
|
|
838
|
+
</dependency>
|
|
839
|
+
<%_ } _%>
|
|
840
|
+
<%_ if (databaseTypeSql && devDatabaseType !== prodDatabaseType) { _%>
|
|
841
|
+
<dependency>
|
|
842
|
+
<groupId>org.testcontainers</groupId>
|
|
843
|
+
<%_ if (prodDatabaseTypeMysql) { _%>
|
|
844
|
+
<artifactId>mysql</artifactId>
|
|
845
|
+
<%_ } else if (prodDatabaseTypeMariadb) { _%>
|
|
846
|
+
<artifactId>mariadb</artifactId>
|
|
847
|
+
<%_ } else if (prodDatabaseTypePostgres) { _%>
|
|
848
|
+
<artifactId>postgresql</artifactId>
|
|
849
|
+
<%_ } else if (prodDatabaseTypeMssql) { _%>
|
|
850
|
+
<artifactId>mssqlserver</artifactId>
|
|
851
|
+
<%_ } else if (prodDatabaseTypeOracle) { _%>
|
|
852
|
+
<artifactId>oracle-xe</artifactId>
|
|
853
|
+
<%_ } _%>
|
|
854
|
+
<scope>provided</scope>
|
|
855
|
+
</dependency>
|
|
856
|
+
<%_ } _%>
|
|
857
|
+
<%_ if (!reactive) { _%>
|
|
858
|
+
<dependency>
|
|
859
|
+
<groupId>com.h2database</groupId>
|
|
860
|
+
<artifactId>h2</artifactId>
|
|
861
|
+
<scope>test</scope>
|
|
862
|
+
</dependency>
|
|
863
|
+
<%_ } _%>
|
|
864
|
+
<%_ if (reactive) { _%>
|
|
865
|
+
<dependency>
|
|
866
|
+
<groupId>io.r2dbc</groupId>
|
|
867
|
+
<artifactId>r2dbc-h2</artifactId>
|
|
868
|
+
<scope>test</scope>
|
|
869
|
+
</dependency>
|
|
870
|
+
<%_ } _%>
|
|
871
|
+
<%_ if (devDatabaseTypeMysql || prodDatabaseTypeMysql) { _%>
|
|
872
|
+
<dependency>
|
|
873
|
+
<groupId>mysql</groupId>
|
|
874
|
+
<artifactId>mysql-connector-java</artifactId>
|
|
875
|
+
<scope>provided</scope>
|
|
876
|
+
</dependency>
|
|
877
|
+
<%_ if (reactive) { _%>
|
|
878
|
+
<dependency>
|
|
879
|
+
<groupId>dev.miku</groupId>
|
|
880
|
+
<artifactId>r2dbc-mysql</artifactId>
|
|
881
|
+
<scope>provided</scope>
|
|
882
|
+
</dependency>
|
|
883
|
+
<%_ } _%>
|
|
884
|
+
<%_ } _%>
|
|
885
|
+
<%_ if (devDatabaseTypeMariadb || prodDatabaseTypeMariadb) { _%>
|
|
886
|
+
<dependency>
|
|
887
|
+
<groupId>org.mariadb.jdbc</groupId>
|
|
888
|
+
<artifactId>mariadb-java-client</artifactId>
|
|
889
|
+
<scope>provided</scope>
|
|
890
|
+
</dependency>
|
|
891
|
+
<%_ if (reactive) { _%>
|
|
892
|
+
<dependency>
|
|
893
|
+
<groupId>org.mariadb</groupId>
|
|
894
|
+
<artifactId>r2dbc-mariadb</artifactId>
|
|
895
|
+
<scope>provided</scope>
|
|
896
|
+
</dependency>
|
|
897
|
+
<%_ } _%>
|
|
898
|
+
<%_ } _%>
|
|
899
|
+
<%_ if (devDatabaseTypeOracle || prodDatabaseTypeOracle) { _%>
|
|
900
|
+
<dependency>
|
|
901
|
+
<groupId>com.oracle.database.jdbc</groupId>
|
|
902
|
+
<artifactId>ojdbc8</artifactId>
|
|
903
|
+
<scope>provided</scope>
|
|
904
|
+
</dependency>
|
|
905
|
+
<%_ } _%>
|
|
906
|
+
<%_ if (devDatabaseTypeMssql || prodDatabaseTypeMssql) { _%>
|
|
907
|
+
<dependency>
|
|
908
|
+
<groupId>com.microsoft.sqlserver</groupId>
|
|
909
|
+
<artifactId>mssql-jdbc</artifactId>
|
|
910
|
+
<scope>provided</scope>
|
|
911
|
+
</dependency>
|
|
912
|
+
<%_ if (reactive) { _%>
|
|
913
|
+
<dependency>
|
|
914
|
+
<groupId>io.r2dbc</groupId>
|
|
915
|
+
<artifactId>r2dbc-mssql</artifactId>
|
|
916
|
+
<scope>provided</scope>
|
|
917
|
+
</dependency>
|
|
918
|
+
<%_ } _%>
|
|
919
|
+
<%_ } _%>
|
|
920
|
+
<%_ if (devDatabaseTypePostgres || prodDatabaseTypePostgres) { _%>
|
|
921
|
+
<dependency>
|
|
922
|
+
<groupId>org.postgresql</groupId>
|
|
923
|
+
<artifactId>postgresql</artifactId>
|
|
924
|
+
<scope>provided</scope>
|
|
925
|
+
</dependency>
|
|
926
|
+
<%_ if (reactive) { _%>
|
|
927
|
+
<dependency>
|
|
928
|
+
<groupId>io.r2dbc</groupId>
|
|
929
|
+
<artifactId>r2dbc-postgresql</artifactId>
|
|
930
|
+
<scope>provided</scope>
|
|
931
|
+
</dependency>
|
|
932
|
+
<%_ } _%>
|
|
911
933
|
<%_ } _%>
|
|
912
934
|
<!-- jhipster-needle-maven-add-dependency -->
|
|
913
935
|
</dependencies>
|
|
914
936
|
|
|
915
937
|
<build>
|
|
916
938
|
<defaultGoal>spring-boot:run</defaultGoal>
|
|
939
|
+
<plugins>
|
|
917
940
|
<%_ if (cucumberTests) { _%>
|
|
918
|
-
|
|
919
|
-
|
|
920
|
-
<
|
|
921
|
-
</
|
|
922
|
-
<testResource>
|
|
923
|
-
<directory><%= TEST_DIR %>features</directory>
|
|
924
|
-
</testResource>
|
|
925
|
-
</testResources>
|
|
941
|
+
<plugin>
|
|
942
|
+
<groupId>org.apache.maven.plugins</groupId>
|
|
943
|
+
<artifactId>maven-antrun-plugin</artifactId>
|
|
944
|
+
</plugin>
|
|
926
945
|
<%_ } _%>
|
|
927
|
-
<plugins>
|
|
928
946
|
<plugin>
|
|
929
947
|
<groupId>org.apache.maven.plugins</groupId>
|
|
930
948
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
@@ -969,12 +987,6 @@
|
|
|
969
987
|
<groupId>org.sonarsource.scanner.maven</groupId>
|
|
970
988
|
<artifactId>sonar-maven-plugin</artifactId>
|
|
971
989
|
</plugin>
|
|
972
|
-
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
973
|
-
<plugin>
|
|
974
|
-
<groupId>org.liquibase</groupId>
|
|
975
|
-
<artifactId>liquibase-maven-plugin</artifactId>
|
|
976
|
-
</plugin>
|
|
977
|
-
<%_ } _%>
|
|
978
990
|
<plugin>
|
|
979
991
|
<groupId>org.springframework.boot</groupId>
|
|
980
992
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
@@ -1005,6 +1017,38 @@
|
|
|
1005
1017
|
</plugins>
|
|
1006
1018
|
<pluginManagement>
|
|
1007
1019
|
<plugins>
|
|
1020
|
+
<%_ if (cucumberTests) { _%>
|
|
1021
|
+
<plugin>
|
|
1022
|
+
<groupId>org.apache.maven.plugins</groupId>
|
|
1023
|
+
<artifactId>maven-antrun-plugin</artifactId>
|
|
1024
|
+
<executions>
|
|
1025
|
+
<execution>
|
|
1026
|
+
<!--Work around. Surefire does not use JUnit's Test Engine discovery functionality -->
|
|
1027
|
+
<id>prepare cucumber feature files</id>
|
|
1028
|
+
<phase>integration-test</phase>
|
|
1029
|
+
<goals>
|
|
1030
|
+
<goal>run</goal>
|
|
1031
|
+
</goals>
|
|
1032
|
+
<configuration>
|
|
1033
|
+
<target>
|
|
1034
|
+
<echo message="Running JUnit Platform CLI"/>
|
|
1035
|
+
<java classname="org.junit.platform.console.ConsoleLauncher"
|
|
1036
|
+
fork="true"
|
|
1037
|
+
failonerror="true"
|
|
1038
|
+
newenvironment="true"
|
|
1039
|
+
maxmemory="512m"
|
|
1040
|
+
classpathref="maven.test.classpath">
|
|
1041
|
+
<arg value="--include-engine"/>
|
|
1042
|
+
<arg value="cucumber"/>
|
|
1043
|
+
<arg value="--scan-classpath"/>
|
|
1044
|
+
<arg value="${project.build.testOutputDirectory}"/>
|
|
1045
|
+
</java>
|
|
1046
|
+
</target>
|
|
1047
|
+
</configuration>
|
|
1048
|
+
</execution>
|
|
1049
|
+
</executions>
|
|
1050
|
+
</plugin>
|
|
1051
|
+
<%_ } _%>
|
|
1008
1052
|
<plugin>
|
|
1009
1053
|
<groupId>org.apache.maven.plugins</groupId>
|
|
1010
1054
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
|
@@ -1267,70 +1311,6 @@
|
|
|
1267
1311
|
</extraDirectories>
|
|
1268
1312
|
</configuration>
|
|
1269
1313
|
</plugin>
|
|
1270
|
-
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
1271
|
-
<plugin>
|
|
1272
|
-
<groupId>org.liquibase</groupId>
|
|
1273
|
-
<artifactId>liquibase-maven-plugin</artifactId>
|
|
1274
|
-
<version>${liquibase.version}</version>
|
|
1275
|
-
<configuration>
|
|
1276
|
-
<changeLogFile>${project.basedir}/<%= SERVER_MAIN_RES_DIR %>config/liquibase/master.xml</changeLogFile>
|
|
1277
|
-
<diffChangeLogFile>${project.basedir}/<%= SERVER_MAIN_RES_DIR %>config/liquibase/changelog/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
|
|
1278
|
-
<driver><% if (devDatabaseTypeMysql) { %>com.mysql.cj.jdbc.Driver<% } else if (devDatabaseTypeMariadb) { %>org.mariadb.jdbc.Driver<% } else if (devDatabaseTypePostgres) { %>org.postgresql.Driver<% } else if (devDatabaseTypeH2Disk) { %>org.h2.Driver<% } else if (devDatabaseTypeOracle) { %>oracle.jdbc.OracleDriver<% } %></driver>
|
|
1279
|
-
<url><% if (devDatabaseTypeMysql || devDatabaseTypeMariadb || devDatabaseTypePostgres || devDatabaseTypeMssql) { %><%- getJDBCUrl(devDatabaseType, { hostname: 'localhost', databaseName: baseName, skipExtraOptions: true }) %><% } else if (devDatabaseTypeH2Disk) { %><%- getJDBCUrl(devDatabaseType, { localDirectory: '${project.build.directory}/h2db/db', databaseName: lowercaseBaseName, skipExtraOptions: true }) %><% } else if (devDatabaseTypeOracle) { %><%- getJDBCUrl(devDatabaseType, { hostname: 'localhost', databaseName: 'xe', skipExtraOptions: true}) %><% } %></url>
|
|
1280
|
-
<defaultSchemaName><% if (devDatabaseTypeMysql) { %><%= baseName %><% } else if (devDatabaseTypePostgres) { %><% } %></defaultSchemaName>
|
|
1281
|
-
<username><% if (devDatabaseTypeMysql) { %>root<% } else if (devDatabaseTypePostgres || devDatabaseTypeH2Any) { %><%= baseName %><% } else if (devDatabaseTypeMssql) { %>SA<% } %></username>
|
|
1282
|
-
<password><% if (devDatabaseTypeMssql) { %>yourStrong(!)Password<% } %></password>
|
|
1283
|
-
<referenceUrl>hibernate:spring:<%= packageName %>.domain?dialect=<% if (devDatabaseTypeMysql) { %>org.hibernate.dialect.MySQL8Dialect<% } else if (devDatabaseTypeMariadb) { %>org.hibernate.dialect.MariaDB103Dialect<% } else if (devDatabaseTypePostgres) { %>tech.jhipster.domain.util.FixedPostgreSQL10Dialect<% } else if (devDatabaseTypeH2Disk) { %>org.hibernate.dialect.H2Dialect<% } else if (devDatabaseTypeOracle) { %>org.hibernate.dialect.Oracle12cDialect<% } else if (devDatabaseTypeMssql) { %>org.hibernate.dialect.SQLServer2012Dialect<% } %>&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
|
|
1284
|
-
<verbose>true</verbose>
|
|
1285
|
-
<logging>debug</logging>
|
|
1286
|
-
<contexts>!test</contexts>
|
|
1287
|
-
<%_ if (authenticationTypeOauth2) { _%>
|
|
1288
|
-
<diffExcludeObjects>oauth_access_token, oauth_approvals, oauth_client_details, oauth_client_token, oauth_code, oauth_refresh_token</diffExcludeObjects>
|
|
1289
|
-
<%_ } _%>
|
|
1290
|
-
</configuration>
|
|
1291
|
-
<dependencies>
|
|
1292
|
-
<dependency>
|
|
1293
|
-
<groupId>org.liquibase</groupId>
|
|
1294
|
-
<artifactId>liquibase-core</artifactId>
|
|
1295
|
-
<version>${liquibase.version}</version>
|
|
1296
|
-
</dependency>
|
|
1297
|
-
<dependency>
|
|
1298
|
-
<groupId>org.liquibase.ext</groupId>
|
|
1299
|
-
<artifactId>liquibase-hibernate5</artifactId>
|
|
1300
|
-
<version>${liquibase-hibernate5.version}</version>
|
|
1301
|
-
</dependency>
|
|
1302
|
-
<dependency>
|
|
1303
|
-
<groupId>org.springframework.boot</groupId>
|
|
1304
|
-
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
|
1305
|
-
<version>${spring-boot.version}</version>
|
|
1306
|
-
</dependency>
|
|
1307
|
-
<dependency>
|
|
1308
|
-
<groupId>javax.validation</groupId>
|
|
1309
|
-
<artifactId>validation-api</artifactId>
|
|
1310
|
-
<version>${validation-api.version}</version>
|
|
1311
|
-
</dependency>
|
|
1312
|
-
<dependency>
|
|
1313
|
-
<groupId>org.javassist</groupId>
|
|
1314
|
-
<artifactId>javassist</artifactId>
|
|
1315
|
-
<version>${javassist.version}</version>
|
|
1316
|
-
</dependency>
|
|
1317
|
-
<%_ if (devDatabaseTypePostgres) { _%>
|
|
1318
|
-
<dependency>
|
|
1319
|
-
<groupId>tech.jhipster</groupId>
|
|
1320
|
-
<artifactId>jhipster-framework</artifactId>
|
|
1321
|
-
<version>${jhipster-dependencies.version}</version>
|
|
1322
|
-
</dependency>
|
|
1323
|
-
<%_ } _%>
|
|
1324
|
-
<%_ if (devDatabaseTypeH2Disk) { _%>
|
|
1325
|
-
<dependency>
|
|
1326
|
-
<groupId>com.h2database</groupId>
|
|
1327
|
-
<artifactId>h2</artifactId>
|
|
1328
|
-
<version>${h2.version}</version>
|
|
1329
|
-
</dependency>
|
|
1330
|
-
<%_ } _%>
|
|
1331
|
-
</dependencies>
|
|
1332
|
-
</plugin>
|
|
1333
|
-
<%_ } _%>
|
|
1334
1314
|
<plugin>
|
|
1335
1315
|
<artifactId>maven-clean-plugin</artifactId>
|
|
1336
1316
|
<version>${maven-clean-plugin.version}</version>
|
|
@@ -1379,8 +1359,8 @@
|
|
|
1379
1359
|
<version>[${maven.version},)</version>
|
|
1380
1360
|
</requireMavenVersion>
|
|
1381
1361
|
<requireJavaVersion>
|
|
1382
|
-
<message>You are running an incompatible version of Java. JHipster supports JDK
|
|
1383
|
-
<version
|
|
1362
|
+
<message>You are running an incompatible version of Java. JHipster supports JDK <%= JAVA_COMPATIBLE_VERSIONS[0] %> to <%= JAVA_COMPATIBLE_VERSIONS[JAVA_COMPATIBLE_VERSIONS.length -1] %>.</message>
|
|
1363
|
+
<version><%= JAVA_COMPATIBLE_VERSIONS.map(version => parseInt(version)).map(version => `[${version},${version +1})`).join(',') %></version>
|
|
1384
1364
|
</requireJavaVersion>
|
|
1385
1365
|
</rules>
|
|
1386
1366
|
</configuration>
|
|
@@ -1441,6 +1421,10 @@
|
|
|
1441
1421
|
<exclude>**/*IT*</exclude>
|
|
1442
1422
|
<exclude>**/*IntTest*</exclude>
|
|
1443
1423
|
</excludes>
|
|
1424
|
+
<%_ if (reactive) { _%>
|
|
1425
|
+
<!-- Fix tests at java 13+ https://github.com/reactor/BlockHound/issues/33 -->
|
|
1426
|
+
<argLine>-XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods</argLine>
|
|
1427
|
+
<%_ } _%>
|
|
1444
1428
|
</configuration>
|
|
1445
1429
|
</plugin>
|
|
1446
1430
|
<plugin>
|
|
@@ -1457,6 +1441,10 @@
|
|
|
1457
1441
|
<include>**/*IT*</include>
|
|
1458
1442
|
<include>**/*IntTest*</include>
|
|
1459
1443
|
</includes>
|
|
1444
|
+
<%_ if (reactive) { _%>
|
|
1445
|
+
<!-- Fix tests at java 13+ https://github.com/reactor/BlockHound/issues/33 -->
|
|
1446
|
+
<argLine>-XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods</argLine>
|
|
1447
|
+
<%_ } _%>
|
|
1460
1448
|
</configuration>
|
|
1461
1449
|
<executions>
|
|
1462
1450
|
<execution>
|
|
@@ -1722,17 +1710,28 @@
|
|
|
1722
1710
|
<activeByDefault>true</activeByDefault>
|
|
1723
1711
|
</activation>
|
|
1724
1712
|
<dependencies>
|
|
1725
|
-
<%_ if (!reactive) { _%>
|
|
1726
|
-
<dependency>
|
|
1727
|
-
<groupId>org.springframework.boot</groupId>
|
|
1728
|
-
<artifactId>spring-boot-starter-undertow</artifactId>
|
|
1729
|
-
</dependency>
|
|
1730
|
-
<%_ } _%>
|
|
1731
1713
|
<dependency>
|
|
1732
1714
|
<groupId>org.springframework.boot</groupId>
|
|
1733
1715
|
<artifactId>spring-boot-devtools</artifactId>
|
|
1734
1716
|
<optional>true</optional>
|
|
1735
1717
|
</dependency>
|
|
1718
|
+
<%_ if (databaseTypeSql && !devDatabaseTypeH2Any) { _%>
|
|
1719
|
+
<dependency>
|
|
1720
|
+
<groupId>org.testcontainers</groupId>
|
|
1721
|
+
<%_ if (devDatabaseTypeMysql) { _%>
|
|
1722
|
+
<artifactId>mysql</artifactId>
|
|
1723
|
+
<%_ } else if (devDatabaseTypeMariadb) { _%>
|
|
1724
|
+
<artifactId>mariadb</artifactId>
|
|
1725
|
+
<%_ } else if (devDatabaseTypePostgres) { _%>
|
|
1726
|
+
<artifactId>postgresql</artifactId>
|
|
1727
|
+
<%_ } else if (devDatabaseTypeMssql) { _%>
|
|
1728
|
+
<artifactId>mssqlserver</artifactId>
|
|
1729
|
+
<%_ } else if (devDatabaseTypeOracle) { _%>
|
|
1730
|
+
<artifactId>oracle-xe</artifactId>
|
|
1731
|
+
<%_ } _%>
|
|
1732
|
+
<scope>test</scope>
|
|
1733
|
+
</dependency>
|
|
1734
|
+
<%_ } _%>
|
|
1736
1735
|
<%_ if (devDatabaseTypeH2Any) { _%>
|
|
1737
1736
|
<dependency>
|
|
1738
1737
|
<groupId>com.h2database</groupId>
|
|
@@ -1744,8 +1743,143 @@
|
|
|
1744
1743
|
<artifactId>r2dbc-h2</artifactId>
|
|
1745
1744
|
</dependency>
|
|
1746
1745
|
<%_ } _%>
|
|
1746
|
+
<%_ } _%>
|
|
1747
|
+
<%_ if (devDatabaseTypeMysql) { _%>
|
|
1748
|
+
<dependency>
|
|
1749
|
+
<groupId>mysql</groupId>
|
|
1750
|
+
<artifactId>mysql-connector-java</artifactId>
|
|
1751
|
+
</dependency>
|
|
1752
|
+
<%_ if (reactive) { _%>
|
|
1753
|
+
<dependency>
|
|
1754
|
+
<groupId>dev.miku</groupId>
|
|
1755
|
+
<artifactId>r2dbc-mysql</artifactId>
|
|
1756
|
+
</dependency>
|
|
1757
|
+
<%_ } _%>
|
|
1758
|
+
<%_ } _%>
|
|
1759
|
+
<%_ if (devDatabaseTypeMariadb) { _%>
|
|
1760
|
+
<dependency>
|
|
1761
|
+
<groupId>org.mariadb.jdbc</groupId>
|
|
1762
|
+
<artifactId>mariadb-java-client</artifactId>
|
|
1763
|
+
</dependency>
|
|
1764
|
+
<%_ if (reactive) { _%>
|
|
1765
|
+
<dependency>
|
|
1766
|
+
<groupId>org.mariadb</groupId>
|
|
1767
|
+
<artifactId>r2dbc-mariadb</artifactId>
|
|
1768
|
+
</dependency>
|
|
1769
|
+
<%_ } _%>
|
|
1770
|
+
<%_ } _%>
|
|
1771
|
+
<%_ if (devDatabaseTypeOracle) { _%>
|
|
1772
|
+
<dependency>
|
|
1773
|
+
<groupId>com.oracle.database.jdbc</groupId>
|
|
1774
|
+
<artifactId>ojdbc8</artifactId>
|
|
1775
|
+
</dependency>
|
|
1776
|
+
<%_ } _%>
|
|
1777
|
+
<%_ if (devDatabaseTypeMssql) { _%>
|
|
1778
|
+
<dependency>
|
|
1779
|
+
<groupId>com.microsoft.sqlserver</groupId>
|
|
1780
|
+
<artifactId>mssql-jdbc</artifactId>
|
|
1781
|
+
</dependency>
|
|
1782
|
+
<dependency>
|
|
1783
|
+
<groupId>org.liquibase.ext</groupId>
|
|
1784
|
+
<artifactId>liquibase-mssql</artifactId>
|
|
1785
|
+
<version>${liquibase.version}</version>
|
|
1786
|
+
</dependency>
|
|
1787
|
+
<%_ if (reactive) { _%>
|
|
1788
|
+
<dependency>
|
|
1789
|
+
<groupId>io.r2dbc</groupId>
|
|
1790
|
+
<artifactId>r2dbc-mssql</artifactId>
|
|
1791
|
+
</dependency>
|
|
1792
|
+
<%_ } _%>
|
|
1793
|
+
<%_ } _%>
|
|
1794
|
+
<%_ if (devDatabaseTypePostgres) { _%>
|
|
1795
|
+
<dependency>
|
|
1796
|
+
<groupId>org.postgresql</groupId>
|
|
1797
|
+
<artifactId>postgresql</artifactId>
|
|
1798
|
+
</dependency>
|
|
1799
|
+
<%_ if (reactive) { _%>
|
|
1800
|
+
<dependency>
|
|
1801
|
+
<groupId>io.r2dbc</groupId>
|
|
1802
|
+
<artifactId>r2dbc-postgresql</artifactId>
|
|
1803
|
+
</dependency>
|
|
1804
|
+
<%_ } _%>
|
|
1747
1805
|
<%_ } _%>
|
|
1748
1806
|
</dependencies>
|
|
1807
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
1808
|
+
<build>
|
|
1809
|
+
<plugins>
|
|
1810
|
+
<plugin>
|
|
1811
|
+
<groupId>org.liquibase</groupId>
|
|
1812
|
+
<artifactId>liquibase-maven-plugin</artifactId>
|
|
1813
|
+
</plugin>
|
|
1814
|
+
</plugins>
|
|
1815
|
+
<pluginManagement>
|
|
1816
|
+
<plugins>
|
|
1817
|
+
<plugin>
|
|
1818
|
+
<groupId>org.liquibase</groupId>
|
|
1819
|
+
<artifactId>liquibase-maven-plugin</artifactId>
|
|
1820
|
+
<version>${liquibase.version}</version>
|
|
1821
|
+
<configuration>
|
|
1822
|
+
<changeLogFile>${project.basedir}/<%= SERVER_MAIN_RES_DIR %>config/liquibase/master.xml</changeLogFile>
|
|
1823
|
+
<diffChangeLogFile>${project.basedir}/<%= SERVER_MAIN_RES_DIR %>config/liquibase/changelog/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
|
|
1824
|
+
<driver><% if (devDatabaseTypeMysql) { %>com.mysql.cj.jdbc.Driver<% } else if (devDatabaseTypeMariadb) { %>org.mariadb.jdbc.Driver<% } else if (devDatabaseTypePostgres) { %>org.postgresql.Driver<% } else if (devDatabaseTypeH2Disk) { %>org.h2.Driver<% } else if (devDatabaseTypeOracle) { %>oracle.jdbc.OracleDriver<% } %></driver>
|
|
1825
|
+
<url><% if (devDatabaseTypeMysql || devDatabaseTypeMariadb || devDatabaseTypePostgres || devDatabaseTypeMssql) { %><%- getJDBCUrl(devDatabaseType, { hostname: 'localhost', databaseName: baseName, skipExtraOptions: true }) %><% } else if (devDatabaseTypeH2Disk) { %><%- getJDBCUrl(devDatabaseType, { localDirectory: '${project.build.directory}/h2db/db', databaseName: lowercaseBaseName, skipExtraOptions: true }) %><% } else if (devDatabaseTypeOracle) { %><%- getJDBCUrl(devDatabaseType, { hostname: 'localhost', databaseName: 'xe', skipExtraOptions: true}) %><% } %></url>
|
|
1826
|
+
<defaultSchemaName><% if (devDatabaseTypeMysql) { %><%= baseName %><% } else if (devDatabaseTypePostgres) { %><% } %></defaultSchemaName>
|
|
1827
|
+
<username><% if (devDatabaseTypeMysql) { %>root<% } else if (devDatabaseTypePostgres || devDatabaseTypeH2Any) { %><%= baseName %><% } else if (devDatabaseTypeMssql) { %>SA<% } %></username>
|
|
1828
|
+
<password><% if (devDatabaseTypeMssql) { %>yourStrong(!)Password<% } %></password>
|
|
1829
|
+
<referenceUrl>hibernate:spring:<%= packageName %>.domain?dialect=<% if (devDatabaseTypeMysql) { %>org.hibernate.dialect.MySQL8Dialect<% } else if (devDatabaseTypeMariadb) { %>org.hibernate.dialect.MariaDB103Dialect<% } else if (devDatabaseTypePostgres) { %>tech.jhipster.domain.util.FixedPostgreSQL10Dialect<% } else if (devDatabaseTypeH2Disk) { %>org.hibernate.dialect.H2Dialect<% } else if (devDatabaseTypeOracle) { %>org.hibernate.dialect.Oracle12cDialect<% } else if (devDatabaseTypeMssql) { %>org.hibernate.dialect.SQLServer2012Dialect<% } %>&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
|
|
1830
|
+
<verbose>true</verbose>
|
|
1831
|
+
<logging>debug</logging>
|
|
1832
|
+
<contexts>!test</contexts>
|
|
1833
|
+
<%_ if (authenticationTypeOauth2) { _%>
|
|
1834
|
+
<diffExcludeObjects>oauth_access_token, oauth_approvals, oauth_client_details, oauth_client_token, oauth_code, oauth_refresh_token</diffExcludeObjects>
|
|
1835
|
+
<%_ } _%>
|
|
1836
|
+
</configuration>
|
|
1837
|
+
<dependencies>
|
|
1838
|
+
<dependency>
|
|
1839
|
+
<groupId>org.liquibase</groupId>
|
|
1840
|
+
<artifactId>liquibase-core</artifactId>
|
|
1841
|
+
<version>${liquibase.version}</version>
|
|
1842
|
+
</dependency>
|
|
1843
|
+
<dependency>
|
|
1844
|
+
<groupId>org.liquibase.ext</groupId>
|
|
1845
|
+
<artifactId>liquibase-hibernate5</artifactId>
|
|
1846
|
+
<version>${liquibase-hibernate5.version}</version>
|
|
1847
|
+
</dependency>
|
|
1848
|
+
<dependency>
|
|
1849
|
+
<groupId>org.springframework.boot</groupId>
|
|
1850
|
+
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
|
1851
|
+
<version>${spring-boot.version}</version>
|
|
1852
|
+
</dependency>
|
|
1853
|
+
<dependency>
|
|
1854
|
+
<groupId>javax.validation</groupId>
|
|
1855
|
+
<artifactId>validation-api</artifactId>
|
|
1856
|
+
<version>${validation-api.version}</version>
|
|
1857
|
+
</dependency>
|
|
1858
|
+
<dependency>
|
|
1859
|
+
<groupId>org.javassist</groupId>
|
|
1860
|
+
<artifactId>javassist</artifactId>
|
|
1861
|
+
<version>${javassist.version}</version>
|
|
1862
|
+
</dependency>
|
|
1863
|
+
<%_ if (devDatabaseTypePostgres) { _%>
|
|
1864
|
+
<dependency>
|
|
1865
|
+
<groupId>tech.jhipster</groupId>
|
|
1866
|
+
<artifactId>jhipster-framework</artifactId>
|
|
1867
|
+
<version>${jhipster-dependencies.version}</version>
|
|
1868
|
+
</dependency>
|
|
1869
|
+
<%_ } _%>
|
|
1870
|
+
<%_ if (devDatabaseTypeH2Disk) { _%>
|
|
1871
|
+
<dependency>
|
|
1872
|
+
<groupId>com.h2database</groupId>
|
|
1873
|
+
<artifactId>h2</artifactId>
|
|
1874
|
+
<version>${h2.version}</version>
|
|
1875
|
+
</dependency>
|
|
1876
|
+
<%_ } _%>
|
|
1877
|
+
</dependencies>
|
|
1878
|
+
</plugin>
|
|
1879
|
+
</plugins>
|
|
1880
|
+
</pluginManagement>
|
|
1881
|
+
</build>
|
|
1882
|
+
<%_ } _%>
|
|
1749
1883
|
<properties>
|
|
1750
1884
|
<!-- default Spring profiles -->
|
|
1751
1885
|
<spring.profiles.active>dev${profile.tls}<%_ if (databaseTypeSql) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
|
|
@@ -1753,12 +1887,86 @@
|
|
|
1753
1887
|
</profile>
|
|
1754
1888
|
<profile>
|
|
1755
1889
|
<id>prod</id>
|
|
1756
|
-
<%_ if (!reactive) { _%>
|
|
1890
|
+
<%_ if (databaseTypeSql || !reactive) { _%>
|
|
1757
1891
|
<dependencies>
|
|
1892
|
+
<%_ } _%>
|
|
1893
|
+
<%_ if (databaseTypeSql) { _%>
|
|
1758
1894
|
<dependency>
|
|
1759
|
-
<groupId>org.
|
|
1760
|
-
|
|
1895
|
+
<groupId>org.testcontainers</groupId>
|
|
1896
|
+
<%_ if (prodDatabaseTypeMysql) { _%>
|
|
1897
|
+
<artifactId>mysql</artifactId>
|
|
1898
|
+
<%_ } else if (prodDatabaseTypeMariadb) { _%>
|
|
1899
|
+
<artifactId>mariadb</artifactId>
|
|
1900
|
+
<%_ } else if (prodDatabaseTypePostgres) { _%>
|
|
1901
|
+
<artifactId>postgresql</artifactId>
|
|
1902
|
+
<%_ } else if (prodDatabaseTypeMssql) { _%>
|
|
1903
|
+
<artifactId>mssqlserver</artifactId>
|
|
1904
|
+
<%_ } else if (prodDatabaseTypeOracle) { _%>
|
|
1905
|
+
<artifactId>oracle-xe</artifactId>
|
|
1906
|
+
<%_ } _%>
|
|
1907
|
+
<scope>test</scope>
|
|
1908
|
+
</dependency>
|
|
1909
|
+
<%_ } _%>
|
|
1910
|
+
<%_ if (prodDatabaseTypeMysql) { _%>
|
|
1911
|
+
<dependency>
|
|
1912
|
+
<groupId>mysql</groupId>
|
|
1913
|
+
<artifactId>mysql-connector-java</artifactId>
|
|
1914
|
+
</dependency>
|
|
1915
|
+
<%_ if (reactive) { _%>
|
|
1916
|
+
<dependency>
|
|
1917
|
+
<groupId>dev.miku</groupId>
|
|
1918
|
+
<artifactId>r2dbc-mysql</artifactId>
|
|
1919
|
+
</dependency>
|
|
1920
|
+
<%_ } _%>
|
|
1921
|
+
<%_ } _%>
|
|
1922
|
+
<%_ if (prodDatabaseTypeMariadb) { _%>
|
|
1923
|
+
<dependency>
|
|
1924
|
+
<groupId>org.mariadb.jdbc</groupId>
|
|
1925
|
+
<artifactId>mariadb-java-client</artifactId>
|
|
1926
|
+
</dependency>
|
|
1927
|
+
<%_ if (reactive) { _%>
|
|
1928
|
+
<dependency>
|
|
1929
|
+
<groupId>org.mariadb</groupId>
|
|
1930
|
+
<artifactId>r2dbc-mariadb</artifactId>
|
|
1931
|
+
</dependency>
|
|
1932
|
+
<%_ } _%>
|
|
1933
|
+
<%_ } _%>
|
|
1934
|
+
<%_ if (prodDatabaseTypeOracle) { _%>
|
|
1935
|
+
<dependency>
|
|
1936
|
+
<groupId>com.oracle.database.jdbc</groupId>
|
|
1937
|
+
<artifactId>ojdbc8</artifactId>
|
|
1938
|
+
</dependency>
|
|
1939
|
+
<%_ } _%>
|
|
1940
|
+
<%_ if (prodDatabaseTypeMssql) { _%>
|
|
1941
|
+
<dependency>
|
|
1942
|
+
<groupId>com.microsoft.sqlserver</groupId>
|
|
1943
|
+
<artifactId>mssql-jdbc</artifactId>
|
|
1761
1944
|
</dependency>
|
|
1945
|
+
<dependency>
|
|
1946
|
+
<groupId>org.liquibase.ext</groupId>
|
|
1947
|
+
<artifactId>liquibase-mssql</artifactId>
|
|
1948
|
+
<version>${liquibase.version}</version>
|
|
1949
|
+
</dependency>
|
|
1950
|
+
<%_ if (reactive) { _%>
|
|
1951
|
+
<dependency>
|
|
1952
|
+
<groupId>io.r2dbc</groupId>
|
|
1953
|
+
<artifactId>r2dbc-mssql</artifactId>
|
|
1954
|
+
</dependency>
|
|
1955
|
+
<%_ } _%>
|
|
1956
|
+
<%_ } _%>
|
|
1957
|
+
<%_ if (prodDatabaseTypePostgres) { _%>
|
|
1958
|
+
<dependency>
|
|
1959
|
+
<groupId>org.postgresql</groupId>
|
|
1960
|
+
<artifactId>postgresql</artifactId>
|
|
1961
|
+
</dependency>
|
|
1962
|
+
<%_ if (reactive) { _%>
|
|
1963
|
+
<dependency>
|
|
1964
|
+
<groupId>io.r2dbc</groupId>
|
|
1965
|
+
<artifactId>r2dbc-postgresql</artifactId>
|
|
1966
|
+
</dependency>
|
|
1967
|
+
<%_ } _%>
|
|
1968
|
+
<%_ } _%>
|
|
1969
|
+
<%_ if (databaseTypeSql || !reactive) { _%>
|
|
1762
1970
|
</dependencies>
|
|
1763
1971
|
<%_ } _%>
|
|
1764
1972
|
<build>
|