diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts index 53c37d95e7a9..3d4771fee2ca 100644 --- a/generators/spring-boot/generator.ts +++ b/generators/spring-boot/generator.ts @@ -453,7 +453,7 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) { async writeFiles({ application }) { return this.writeFiles({ sections: serverFiles, - rootTemplatesPath: ['', '../../server/templates/', '../../java/generators/domain/templates/'], + rootTemplatesPath: ['', '../../java/generators/domain/templates/'], context: application, }); }, diff --git a/generators/server/templates/.devcontainer/Dockerfile.ejs b/generators/spring-boot/templates/.devcontainer/Dockerfile.ejs similarity index 100% rename from generators/server/templates/.devcontainer/Dockerfile.ejs rename to generators/spring-boot/templates/.devcontainer/Dockerfile.ejs diff --git a/generators/server/templates/.devcontainer/devcontainer.json.ejs b/generators/spring-boot/templates/.devcontainer/devcontainer.json.ejs similarity index 100% rename from generators/server/templates/.devcontainer/devcontainer.json.ejs rename to generators/spring-boot/templates/.devcontainer/devcontainer.json.ejs diff --git a/generators/server/templates/README.md.jhi.spring-boot.ejs b/generators/spring-boot/templates/README.md.jhi.spring-boot.ejs similarity index 100% rename from generators/server/templates/README.md.jhi.spring-boot.ejs rename to generators/spring-boot/templates/README.md.jhi.spring-boot.ejs diff --git a/generators/server/templates/build.gradle.ejs b/generators/spring-boot/templates/build.gradle.ejs similarity index 100% rename from generators/server/templates/build.gradle.ejs rename to generators/spring-boot/templates/build.gradle.ejs diff --git a/generators/server/templates/gradle.properties.ejs b/generators/spring-boot/templates/gradle.properties.ejs similarity index 100% rename from generators/server/templates/gradle.properties.ejs rename to generators/spring-boot/templates/gradle.properties.ejs diff --git a/generators/server/templates/gradle/profile_dev.gradle.ejs b/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs similarity index 100% rename from generators/server/templates/gradle/profile_dev.gradle.ejs rename to generators/spring-boot/templates/gradle/profile_dev.gradle.ejs diff --git a/generators/server/templates/gradle/profile_prod.gradle.ejs b/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs similarity index 100% rename from generators/server/templates/gradle/profile_prod.gradle.ejs rename to generators/spring-boot/templates/gradle/profile_prod.gradle.ejs diff --git a/generators/server/templates/gradle/war.gradle.ejs b/generators/spring-boot/templates/gradle/war.gradle.ejs similarity index 100% rename from generators/server/templates/gradle/war.gradle.ejs rename to generators/spring-boot/templates/gradle/war.gradle.ejs diff --git a/generators/server/templates/gradle/zipkin.gradle.ejs b/generators/spring-boot/templates/gradle/zipkin.gradle.ejs similarity index 100% rename from generators/server/templates/gradle/zipkin.gradle.ejs rename to generators/spring-boot/templates/gradle/zipkin.gradle.ejs diff --git a/generators/server/templates/micro_services_architecture.md b/generators/spring-boot/templates/micro_services_architecture.md similarity index 100% rename from generators/server/templates/micro_services_architecture.md rename to generators/spring-boot/templates/micro_services_architecture.md diff --git a/generators/server/templates/package.json.ejs b/generators/spring-boot/templates/package.json.ejs similarity index 100% rename from generators/server/templates/package.json.ejs rename to generators/spring-boot/templates/package.json.ejs diff --git a/generators/server/templates/pom.xml.ejs b/generators/spring-boot/templates/pom.xml.ejs similarity index 100% rename from generators/server/templates/pom.xml.ejs rename to generators/spring-boot/templates/pom.xml.ejs diff --git a/generators/server/templates/settings.gradle.ejs b/generators/spring-boot/templates/settings.gradle.ejs similarity index 100% rename from generators/server/templates/settings.gradle.ejs rename to generators/spring-boot/templates/settings.gradle.ejs diff --git a/generators/server/templates/src/main/java/_package_/Application.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/Application.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/Application.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/Application.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/ApplicationWebXml.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/ApplicationWebXml.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/ApplicationWebXml.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/ApplicationWebXml.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/Constants.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/Constants.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/Constants.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/Constants.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/WebConfigurer.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/WebConfigurer.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/domain/PersistentToken.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/domain/PersistentToken.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/domain/PersistentToken.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/domain/PersistentToken.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/domain/User.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/domain/User.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/domain/User.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/domain/User.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/SecurityUtils.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/SecurityUtils.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/SecurityUtils.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/SecurityUtils.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/MailService.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs diff --git a/generators/server/templates/src/main/resources/banner-no-color.txt b/generators/spring-boot/templates/src/main/resources/banner-no-color.txt similarity index 100% rename from generators/server/templates/src/main/resources/banner-no-color.txt rename to generators/spring-boot/templates/src/main/resources/banner-no-color.txt diff --git a/generators/server/templates/src/main/resources/banner.txt b/generators/spring-boot/templates/src/main/resources/banner.txt similarity index 100% rename from generators/server/templates/src/main/resources/banner.txt rename to generators/spring-boot/templates/src/main/resources/banner.txt diff --git a/generators/server/templates/src/main/resources/banner_react.txt b/generators/spring-boot/templates/src/main/resources/banner_react.txt similarity index 100% rename from generators/server/templates/src/main/resources/banner_react.txt rename to generators/spring-boot/templates/src/main/resources/banner_react.txt diff --git a/generators/server/templates/src/main/resources/banner_vue.txt b/generators/spring-boot/templates/src/main/resources/banner_vue.txt similarity index 100% rename from generators/server/templates/src/main/resources/banner_vue.txt rename to generators/spring-boot/templates/src/main/resources/banner_vue.txt diff --git a/generators/server/templates/src/main/resources/config/application-dev.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/application-dev.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/application-prod.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application-prod.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/application-prod.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/application-prod.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/application-tls.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application-tls.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/application-tls.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/application-tls.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/application.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/application.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/application.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/bootstrap-prod.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/bootstrap-prod.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/bootstrap.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/bootstrap.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/bootstrap.yml.ejs diff --git a/generators/server/templates/src/main/resources/i18n/messages.properties.ejs b/generators/spring-boot/templates/src/main/resources/i18n/messages.properties.ejs similarity index 100% rename from generators/server/templates/src/main/resources/i18n/messages.properties.ejs rename to generators/spring-boot/templates/src/main/resources/i18n/messages.properties.ejs diff --git a/generators/server/templates/src/main/resources/logback-spring.xml.ejs b/generators/spring-boot/templates/src/main/resources/logback-spring.xml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/logback-spring.xml.ejs rename to generators/spring-boot/templates/src/main/resources/logback-spring.xml.ejs diff --git a/generators/server/templates/src/main/resources/static/index_microservices.html.ejs b/generators/spring-boot/templates/src/main/resources/static/index_microservices.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/static/index_microservices.html.ejs rename to generators/spring-boot/templates/src/main/resources/static/index_microservices.html.ejs diff --git a/generators/server/templates/src/main/resources/templates/error.html.ejs b/generators/spring-boot/templates/src/main/resources/templates/error.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/templates/error.html.ejs rename to generators/spring-boot/templates/src/main/resources/templates/error.html.ejs diff --git a/generators/server/templates/src/main/resources/templates/mail/activationEmail.html.ejs b/generators/spring-boot/templates/src/main/resources/templates/mail/activationEmail.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/templates/mail/activationEmail.html.ejs rename to generators/spring-boot/templates/src/main/resources/templates/mail/activationEmail.html.ejs diff --git a/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs b/generators/spring-boot/templates/src/main/resources/templates/mail/creationEmail.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs rename to generators/spring-boot/templates/src/main/resources/templates/mail/creationEmail.html.ejs diff --git a/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs b/generators/spring-boot/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs rename to generators/spring-boot/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs diff --git a/generators/server/templates/src/test/java/_package_/IntegrationTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/IntegrationTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/IntegrationTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/IntegrationTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/service/MailServiceIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/service/MailServiceIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs diff --git a/generators/server/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs b/generators/spring-boot/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs similarity index 100% rename from generators/server/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs rename to generators/spring-boot/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs diff --git a/generators/server/templates/src/test/resources/config/application.yml.ejs b/generators/spring-boot/templates/src/test/resources/config/application.yml.ejs similarity index 100% rename from generators/server/templates/src/test/resources/config/application.yml.ejs rename to generators/spring-boot/templates/src/test/resources/config/application.yml.ejs diff --git a/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs b/generators/spring-boot/templates/src/test/resources/config/bootstrap.yml.ejs similarity index 100% rename from generators/server/templates/src/test/resources/config/bootstrap.yml.ejs rename to generators/spring-boot/templates/src/test/resources/config/bootstrap.yml.ejs diff --git a/generators/server/templates/src/test/resources/i18n/messages_en.properties.ejs b/generators/spring-boot/templates/src/test/resources/i18n/messages_en.properties.ejs similarity index 100% rename from generators/server/templates/src/test/resources/i18n/messages_en.properties.ejs rename to generators/spring-boot/templates/src/test/resources/i18n/messages_en.properties.ejs diff --git a/generators/server/templates/src/test/resources/junit-platform.properties.ejs b/generators/spring-boot/templates/src/test/resources/junit-platform.properties.ejs similarity index 100% rename from generators/server/templates/src/test/resources/junit-platform.properties.ejs rename to generators/spring-boot/templates/src/test/resources/junit-platform.properties.ejs diff --git a/generators/server/templates/src/test/resources/logback.xml.ejs b/generators/spring-boot/templates/src/test/resources/logback.xml.ejs similarity index 100% rename from generators/server/templates/src/test/resources/logback.xml.ejs rename to generators/spring-boot/templates/src/test/resources/logback.xml.ejs diff --git a/generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs b/generators/spring-boot/templates/src/test/resources/templates/mail/activationEmail.html.ejs similarity index 100% rename from generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs rename to generators/spring-boot/templates/src/test/resources/templates/mail/activationEmail.html.ejs diff --git a/generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs b/generators/spring-boot/templates/src/test/resources/templates/mail/creationEmail.html.ejs similarity index 100% rename from generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs rename to generators/spring-boot/templates/src/test/resources/templates/mail/creationEmail.html.ejs diff --git a/generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs b/generators/spring-boot/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs similarity index 100% rename from generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs rename to generators/spring-boot/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs diff --git a/generators/server/templates/src/test/resources/templates/mail/testEmail.html.ejs b/generators/spring-boot/templates/src/test/resources/templates/mail/testEmail.html.ejs similarity index 100% rename from generators/server/templates/src/test/resources/templates/mail/testEmail.html.ejs rename to generators/spring-boot/templates/src/test/resources/templates/mail/testEmail.html.ejs