From 1ba270d9f1634f68e779da103ae7607728bbe60d Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 20:54:55 -0300 Subject: [PATCH 01/10] synchronize adjusts --- .blueprint/synchronize/generator.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.blueprint/synchronize/generator.js b/.blueprint/synchronize/generator.js index 0245017fb..3c6bb5c36 100644 --- a/.blueprint/synchronize/generator.js +++ b/.blueprint/synchronize/generator.js @@ -50,6 +50,9 @@ export default class SynchronizeGenerator extends BaseGenerator { .replaceAll(';\n', '\n') .replaceAll('\nimport static ', '\nimport ') .replaceAll('public class ', 'class ') + .replaceAll('public abstract class ', 'abstract class ') + .replaceAll('new ', '') + .replaceAll('::class', '::class.java') .replaceAll('.class', '::class') .replaceAll(/ (?:extends|implements) (\w+)/g, ' : $1') .replaceAll(/ (?:extends|implements) /g, ' : ') @@ -57,6 +60,7 @@ export default class SynchronizeGenerator extends BaseGenerator { .replaceAll(/\n( {4})(private |)?(?:final )?(\w+) (\w+)(\n| = )/g, '\n$1$2lateinit var $4: $3$5') .replaceAll(/private static final (\w+) /g, 'private val ') .replaceAll(/(?:public |protected )?(\w+) (\w+)\((.*)\) {/g, 'fun $2($3): $1 {') + .replaceAll(' {}\n', '\n') .replaceAll(': void', ''), ); }), From 34ff261d575ad92757e78f8b6aaccc2cf29f04fb Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 20:55:11 -0300 Subject: [PATCH 02/10] fix license header --- .blueprint/cli/commands.mjs | 2 +- .blueprint/generate-sample/command.mjs | 2 +- .blueprint/synchronize/command.js | 2 +- .blueprint/synchronize/generator.js | 2 +- .blueprint/synchronize/index.js | 2 +- LICENSE | 2 +- cli/logo.mjs | 2 +- generators/detekt/templates/gradle/detekt.gradle.ejs | 4 ++-- generators/kotlin/templates/gradle/kotlin.gradle.ejs | 4 ++-- .../src/main/kotlin/_package_/GeneratedByJHipster.kt.ejs | 2 +- generators/ktlint/templates/gradle/ktlint.gradle.ejs | 4 ++-- generators/spring-boot-v2/migration.cjs | 2 +- .../kotlin/_package_/client/AuthorizedUserFeignClient.kt.ejs | 4 ++-- .../client/OAuth2UserClientFeignConfiguration.kt.ejs | 4 ++-- .../_package_/client/OAuth2_UserFeignClientInterceptor.kt.ejs | 4 ++-- .../main/kotlin/_package_/config/LocaleConfiguration.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/domain/Authority.kt.ejs | 4 ++-- .../kotlin/_package_/repository/AuthorityRepository.kt.ejs | 4 ++-- .../main/kotlin/_package_/security/IatTokenEnhancer.kt.ejs | 4 ++-- .../main/kotlin/_package_/security/jwt/JWTConfigurer.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/security/jwt/JWTFilter.kt.ejs | 4 ++-- .../main/kotlin/_package_/security/jwt/TokenProvider.kt.ejs | 4 ++-- .../security/oauth2/CachedUserInfoTokenServices.kt.ejs | 4 ++-- .../security/oauth2/SimpleAuthoritiesExtractor.kt.ejs | 4 ++-- .../_package_/security/oauth2/SimplePrincipalExtractor.kt.ejs | 4 ++-- .../kotlin/_package_/web/rest/ClientForwardController.kt.ejs | 2 +- .../test/kotlin/_package_/security/jwt/JWTFilterTest.kt.ejs | 4 ++-- .../kotlin/_package_/security/jwt/TokenProviderTest.kt.ejs | 4 ++-- .../_package_/web/rest/ClientForwardControllerTest.kt.ejs | 4 ++-- generators/spring-boot/kotlin-constants.js | 2 +- generators/spring-boot/needle-server-cache-kt.cjs | 2 +- generators/spring-boot/needles.cjs | 2 +- .../templates/_global_partials_entity_/field_validators.ejs | 4 ++-- .../_global_partials_entity_/it_patch_update.partial.kt.ejs | 4 ++-- .../templates/_global_partials_entity_/save_template.ejs | 4 ++-- .../templates/_global_partials_entity_/update_template.ejs | 2 +- .../src/test/kotlin/_package_/cucumber/CucumberIT.kt.ejs | 4 ++-- .../cucumber/CucumberTestContextConfiguration.kt.ejs | 4 ++-- .../test/kotlin/_package_/cucumber/stepdefs/StepDefs.kt.ejs | 4 ++-- .../kotlin/_package_/cucumber/stepdefs/UserStepDefs.kt.ejs | 4 ++-- .../domain/_global_partials_entity_/field_validators.ejs | 4 ++-- .../_entityPackage_/domain/_persistClass_.kt.jhi.ejs | 4 ++-- .../domain/_persistClass_.kt.jhi.jakarta_validation.ejs | 2 +- .../_entityPackage_/domain/enumeration/_enumName_.kt.ejs | 4 ++-- .../_entityPackage_/domain/_persistClass_Test.kt.ejs | 4 ++-- .../kotlin/_package_/client/AuthorizationHeaderUtil.kt.ejs | 4 ++-- .../main/kotlin/_package_/client/AuthorizedFeignClient.kt.ejs | 4 ++-- .../client/OAuth2InterceptedFeignConfiguration.kt.ejs | 4 ++-- .../_package_/client/TokenRelayRequestInterceptor.kt.ejs | 4 ++-- .../_package_/client/UserFeignClientInterceptor_jwt.kt.ejs | 4 ++-- .../main/kotlin/_package_/config/FeignConfiguration.kt.ejs | 4 ++-- .../_package_/client/AuthorizationHeaderUtilTest.kt.ejs | 2 +- .../security/jwt/JWTRelayGatewayFilterFactory.kt.ejs | 4 ++-- .../kotlin/_package_/web/rest/GatewayResource_reactive.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/web/rest/vm/RouteVM.kt.ejs | 4 ++-- .../kotlin/_package_/broker/KafkaConsumer_imperative.kt.ejs | 2 +- .../kotlin/_package_/broker/KafkaConsumer_reactive.kt.ejs | 2 +- .../src/main/kotlin/_package_/broker/KafkaProducer.kt.ejs | 2 +- .../kotlin/_package_/web/rest/KafkaResource_imperative.kt.ejs | 4 ++-- .../src/test/kotlin/_package_/config/EmbeddedKafka.kt.ejs | 2 +- .../test/kotlin/_package_/config/KafkaTestContainer.kt.ejs | 2 +- .../_package_/web/rest/KafkaResourceIT_imperative.kt.ejs | 4 ++-- .../kotlin/_package_/config/LiquibaseConfiguration.kt.ejs | 4 ++-- generators/spring-boot/templates/pom.xml.ejs | 2 +- .../reactive/_global_partials_entity_/save_template.ejs | 2 +- .../reactive/_global_partials_entity_/update_template.ejs | 2 +- .../main/kotlin/_package_/config/CacheConfiguration.kt.ejs | 4 ++-- .../kotlin/_package_/config/CacheFactoryConfiguration.kt.ejs | 4 ++-- .../src/test/kotlin/_package_/config/EmbeddedRedis.kt.ejs | 2 +- .../domain/_persistClass_.kt.jhi.spring_data_cassandra.ejs | 2 +- .../_entityPackage_/repository/_entityClass_Repository.kt.ejs | 4 ++-- .../main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs | 2 +- .../src/test/kotlin/_package_/CassandraKeyspaceIT.kt.ejs | 4 ++-- .../kotlin/_package_/config/CassandraTestContainer.kt.ejs | 2 +- .../main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs | 2 +- .../repository/PersistentTokenRepository_couchbase.kt.ejs | 2 +- .../kotlin/_package_/config/CouchbaseTestContainer.kt.ejs | 2 +- .../src/test/kotlin/_package_/config/EmbeddedCouchbase.kt.ejs | 2 +- .../domain/_persistClass_.kt.jhi.elastic_search.ejs | 2 +- .../repository/search/_entityClass_SearchRepository.kt.ejs | 4 ++-- .../kotlin/_package_/config/ElasticsearchConfiguration.kt.ejs | 4 ++-- .../_package_/repository/search/UserSearchRepository.kt.ejs | 4 ++-- .../_package_/config/ElasticsearchTestConfiguration.kt.ejs | 2 +- .../kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs | 2 +- .../test/kotlin/_package_/config/EmbeddedElasticsearch.kt.ejs | 2 +- .../_entityPackage_/repository/_entityClass_Repository.kt.ejs | 4 ++-- .../repository/_entityClass_Repository_reactive.kt.ejs | 4 ++-- .../main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs | 2 +- .../config/dbmigrations/InitialSetupMigration.kt.ejs | 4 ++-- .../src/test/kotlin/_package_/config/EmbeddedMongo.kt.ejs | 2 +- .../_entityPackage_/repository/_entityClass_Repository.kt.ejs | 4 ++-- .../_package_/config/DatabaseConfiguration.kt_neo4j.ejs | 2 +- .../main/kotlin/_package_/config/neo4j/Neo4jMigrations.kt.ejs | 4 ++-- .../src/test/kotlin/_package_/config/EmbeddedNeo4j.kt.ejs | 2 +- .../test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs | 2 +- .../domain/_persistClass_.kt.jhi.hibernate_cache.ejs | 2 +- .../domain/_persistClass_.kt.jhi.jakarta_lifecycle_events.ejs | 2 +- .../domain/_persistClass_.kt.jhi.jakarta_persistence.ejs | 2 +- .../domain/_persistClass_.kt.jhi.spring_data_persistable.ejs | 2 +- .../domain/_persistClass_.kt.jhi.spring_data_reactive.ejs | 2 +- .../_entityPackage_/domain/_persistClass_Callback.kt.ejs | 2 +- .../_entityPackage_/domain/relationship_validators.ejs | 4 ++-- .../_entityPackage_/repository/_entityClass_Repository.kt.ejs | 4 ++-- .../_entityClass_RepositoryInternalImpl_reactive.kt.ejs | 4 ++-- .../_entityClass_RepositoryWithBagRelationships.kt.ejs | 2 +- .../repository/_entityClass_Repository_reactive.kt.ejs | 4 ++-- .../repository/_entityClass_SqlHelper_reactive.kt.ejs | 2 +- .../rowmapper/_entityClass_RowMapper_reactive.kt.ejs | 4 ++-- .../main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs | 2 +- .../kotlin/_package_/repository/EntityManager_reactive.kt.ejs | 2 +- .../kotlin/_package_/repository/UserSqlHelper_reactive.kt.ejs | 2 +- .../repository/rowmapper/ColumnConverter_reactive.kt.ejs | 4 ++-- .../repository/rowmapper/UserRowMapper_reactive.kt.ejs | 4 ++-- .../src/test/kotlin/_package_/config/EmbeddedSQL.kt.ejs | 2 +- .../test/kotlin/_package_/config/MariadbTestContainer.kt.ejs | 2 +- .../test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs | 2 +- .../test/kotlin/_package_/config/MysqlTestContainer.kt.ejs | 2 +- .../kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs | 2 +- .../src/test/kotlin/_package_/config/SqlTestContainer.kt.ejs | 2 +- .../_package_/config/timezone/HibernateTimeZoneIT.kt.ejs | 4 ++-- .../_package_/repository/timezone/DateTimeWrapper.kt.ejs | 4 ++-- .../repository/timezone/DateTimeWrapperRepository.kt.ejs | 4 ++-- .../src/test/resources/config/application-testdev.yml.ejs | 2 +- .../src/test/resources/config/application-testprod.yml.ejs | 2 +- .../kotlin/_package_/config/WebsocketConfiguration.kt.ejs | 4 ++-- .../_package_/config/WebsocketSecurityConfiguration.kt.ejs | 4 ++-- .../kotlin/_package_/web/websocket/ActivityService.kt.ejs | 4 ++-- .../kotlin/_package_/web/websocket/dto/ActivityDTO.kt.ejs | 4 ++-- .../templates/src/main/kotlin/_package_/Application.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/ApplicationWebXml.kt.ejs | 4 ++-- .../_entityPackage_/_partials_entity_/delete_template.ejs | 4 ++-- .../_partials_entity_/get_all_stream_template.ejs | 4 ++-- .../_entityPackage_/_partials_entity_/get_all_template.ejs | 4 ++-- .../_partials_entity_/get_filtered_template.ejs | 4 ++-- .../_entityPackage_/_partials_entity_/get_template.ejs | 4 ++-- .../_entityPackage_/_partials_entity_/inject_template.ejs | 4 ++-- .../_entityPackage_/_partials_entity_/patch_template.ejs | 4 ++-- .../_partials_entity_/search_stream_template.ejs | 4 ++-- .../_entityPackage_/_partials_entity_/search_template.ejs | 4 ++-- .../_entityPackage_/repository/UserRepository.kt.ejs | 4 ++-- .../_package_/_entityPackage_/service/UserService.kt.ejs | 4 ++-- .../_entityPackage_/service/_entityClass_QueryService.kt.ejs | 4 ++-- .../_entityPackage_/service/_entityClass_Service.kt.ejs | 4 ++-- .../service/criteria/_entityClass_Criteria.kt.ejs | 4 ++-- .../_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs | 2 +- .../service/impl/_entityClass_ServiceImpl.kt.ejs | 4 ++-- .../_entityPackage_/service/mapper/EntityMapper.kt.ejs | 4 ++-- .../_entityPackage_/service/mapper/_entityClass_Mapper.kt.ejs | 4 ++-- .../_entityPackage_/web/rest/PublicUserResource.kt.ejs | 2 +- .../_package_/_entityPackage_/web/rest/UserResource.kt.ejs | 4 ++-- .../_entityPackage_/web/rest/_entityClass_Resource.kt.ejs | 4 ++-- .../main/kotlin/_package_/aop/logging/LoggingAspect.kt.ejs | 4 ++-- .../main/kotlin/_package_/config/ApplicationProperties.kt.ejs | 4 ++-- .../main/kotlin/_package_/config/AsyncConfiguration.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/config/Constants.kt.ejs | 4 ++-- .../_package_/config/DateTimeFormatConfiguration.kt.ejs | 4 ++-- .../_package_/config/EurekaWorkaroundConfiguration.kt.ejs | 2 +- .../main/kotlin/_package_/config/JacksonConfiguration.kt.ejs | 4 ++-- .../kotlin/_package_/config/LoggingAspectConfiguration.kt.ejs | 4 ++-- .../main/kotlin/_package_/config/LoggingConfiguration.kt.ejs | 4 ++-- .../main/kotlin/_package_/config/OpenApiConfiguration.kt.ejs | 2 +- .../_package_/config/SecurityConfiguration_imperative.kt.ejs | 4 ++-- .../_package_/config/SecurityConfiguration_reactive.kt.ejs | 2 +- .../_package_/config/StaticResourcesWebConfiguration.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/config/WebConfigurer.kt.ejs | 4 ++-- .../kotlin/_package_/domain/AbstractAuditingEntity.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/domain/PersistentToken.kt.ejs | 4 ++-- .../templates/src/main/kotlin/_package_/domain/User.kt.ejs | 4 ++-- .../kotlin/_package_/management/SecurityMetersService.kt.ejs | 2 +- .../_package_/repository/PersistentTokenRepository.kt.ejs | 4 ++-- .../kotlin/_package_/security/AuthoritiesConstants.kt.ejs | 4 ++-- .../kotlin/_package_/security/DomainUserDetailsService.kt.ejs | 4 ++-- .../security/PersistentTokenRememberMeServices.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/security/SecurityUtils.kt.ejs | 2 +- .../_package_/security/SpringSecurityAuditorAware.kt.ejs | 4 ++-- .../_package_/security/UserNotActivatedException.kt.ejs | 4 ++-- .../kotlin/_package_/security/oauth2/AudienceValidator.kt.ejs | 4 ++-- .../_package_/security/oauth2/CustomClaimConverter.kt.ejs | 2 +- .../kotlin/_package_/service/EmailAlreadyUsedException.kt.ejs | 4 ++-- .../kotlin/_package_/service/InvalidPasswordException.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/service/MailService.kt.ejs | 4 ++-- .../_package_/service/UsernameAlreadyUsedException.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/service/dto/AdminUserDTO.kt.ejs | 4 ++-- .../kotlin/_package_/service/dto/PasswordChangeDTO.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/service/dto/UserDTO.kt.ejs | 4 ++-- .../main/kotlin/_package_/service/mapper/UserMapper.kt.ejs | 4 ++-- .../kotlin/_package_/web/filter/SpaWebFilter_reactive.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs | 2 +- .../main/kotlin/_package_/web/rest/AuthInfoResource.kt.ejs | 4 ++-- .../kotlin/_package_/web/rest/AuthenticateController.kt.ejs | 4 ++-- .../_package_/web/rest/LogoutResource_imperative.kt.ejs | 4 ++-- .../kotlin/_package_/web/rest/LogoutResource_reactive.kt.ejs | 4 ++-- .../_package_/web/rest/errors/BadRequestAlertException.kt.ejs | 4 ++-- .../web/rest/errors/EmailAlreadyUsedException.kt.ejs | 4 ++-- .../kotlin/_package_/web/rest/errors/ErrorConstants.kt.ejs | 4 ++-- .../_package_/web/rest/errors/ExceptionTranslator.kt.ejs | 4 ++-- .../main/kotlin/_package_/web/rest/errors/FieldErrorVM.kt.ejs | 4 ++-- .../_package_/web/rest/errors/InvalidPasswordException.kt.ejs | 4 ++-- .../web/rest/errors/LoginAlreadyUsedException.kt.ejs | 4 ++-- .../main/kotlin/_package_/web/rest/vm/KeyAndPasswordVM.kt.ejs | 4 ++-- .../src/main/kotlin/_package_/web/rest/vm/LoginVM.kt.ejs | 4 ++-- .../main/kotlin/_package_/web/rest/vm/ManagedUserVM.kt.ejs | 4 ++-- .../src/test/kotlin/_package_/IntegrationTest.kt.ejs | 2 +- .../_package_/_entityPackage_/service/UserServiceIT.kt.ejs | 4 ++-- .../_entityPackage_/service/dto/_dtoClass_Test.kt.ejs | 4 ++-- .../service/mapper/_entityClass_MapperTest.kt.ejs | 4 ++-- .../_entityPackage_/web/rest/PublicUserResourceIT.kt.ejs | 2 +- .../_package_/_entityPackage_/web/rest/UserResourceIT.kt.ejs | 4 ++-- .../_entityPackage_/web/rest/_entityClass_ResourceIT.kt.ejs | 4 ++-- .../kotlin/_package_/config/AsyncSyncConfiguration.kt.ejs | 2 +- .../_package_/config/JHipsterBlockHoundIntegration.kt.ejs | 4 ++-- .../_package_/config/StaticResourcesWebConfigurerTest.kt.ejs | 2 +- .../kotlin/_package_/config/TestSecurityConfiguration.kt.ejs | 4 ++-- .../src/test/kotlin/_package_/config/WebConfigurerTest.kt.ejs | 4 ++-- .../_package_/config/WebConfigurerTestController.kt.ejs | 4 ++-- .../_package_/security/DomainUserDetailsServiceIT.kt.ejs | 4 ++-- .../security/SecurityUtilsUnitTest_imperative.kt.ejs | 4 ++-- .../_package_/security/oauth2/AudienceValidatorTest.kt.ejs | 4 ++-- .../_package_/security/oauth2/CustomClaimConverterIT.kt.ejs | 2 +- .../src/test/kotlin/_package_/service/MailServiceIT.kt.ejs | 4 ++-- .../kotlin/_package_/service/mapper/UserMapperTest.kt.ejs | 4 ++-- .../test/kotlin/_package_/web/rest/AccountResourceIT.kt.ejs | 4 ++-- .../kotlin/_package_/web/rest/AccountResourceIT_oauth2.kt.ejs | 2 +- .../web/rest/AccountResourceIT_skipUserManagement.kt.ejs | 2 +- .../kotlin/_package_/web/rest/AuthenticateControllerIT.kt.ejs | 4 ++-- .../test/kotlin/_package_/web/rest/LogoutResourceIT.kt.ejs | 4 ++-- .../src/test/kotlin/_package_/web/rest/TestUtil.kt.ejs | 4 ++-- .../_package_/web/rest/WithUnauthenticatedMockUser.kt.ejs | 2 +- .../web/rest/errors/ExceptionTranslatorIT_imperative.kt.ejs | 4 ++-- .../web/rest/errors/ExceptionTranslatorIT_reactive.kt.ejs | 4 ++-- .../web/rest/errors/ExceptionTranslatorTestController.kt.ejs | 4 ++-- 231 files changed, 385 insertions(+), 385 deletions(-) diff --git a/.blueprint/cli/commands.mjs b/.blueprint/cli/commands.mjs index 4b326c988..73cc020b6 100644 --- a/.blueprint/cli/commands.mjs +++ b/.blueprint/cli/commands.mjs @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/.blueprint/generate-sample/command.mjs b/.blueprint/generate-sample/command.mjs index 4df934578..368b48ff8 100644 --- a/.blueprint/generate-sample/command.mjs +++ b/.blueprint/generate-sample/command.mjs @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/.blueprint/synchronize/command.js b/.blueprint/synchronize/command.js index d3d94e6df..45e1c84e0 100644 --- a/.blueprint/synchronize/command.js +++ b/.blueprint/synchronize/command.js @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/.blueprint/synchronize/generator.js b/.blueprint/synchronize/generator.js index 3c6bb5c36..0e48d183e 100644 --- a/.blueprint/synchronize/generator.js +++ b/.blueprint/synchronize/generator.js @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/.blueprint/synchronize/index.js b/.blueprint/synchronize/index.js index a360de8f3..65ea190f5 100644 --- a/.blueprint/synchronize/index.js +++ b/.blueprint/synchronize/index.js @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/LICENSE b/LICENSE index 274e09f9b..6530ce070 100644 --- a/LICENSE +++ b/LICENSE @@ -191,7 +191,7 @@ Copyright [yyyy] [name of copyright owner] - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/cli/logo.mjs b/cli/logo.mjs index c7295e1aa..26c4ee61a 100644 --- a/cli/logo.mjs +++ b/cli/logo.mjs @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/generators/detekt/templates/gradle/detekt.gradle.ejs b/generators/detekt/templates/gradle/detekt.gradle.ejs index 420b5739f..511bd82dd 100644 --- a/generators/detekt/templates/gradle/detekt.gradle.ejs +++ b/generators/detekt/templates/gradle/detekt.gradle.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/kotlin/templates/gradle/kotlin.gradle.ejs b/generators/kotlin/templates/gradle/kotlin.gradle.ejs index 22af89ff9..af01c78c3 100644 --- a/generators/kotlin/templates/gradle/kotlin.gradle.ejs +++ b/generators/kotlin/templates/gradle/kotlin.gradle.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/kotlin/templates/src/main/kotlin/_package_/GeneratedByJHipster.kt.ejs b/generators/kotlin/templates/src/main/kotlin/_package_/GeneratedByJHipster.kt.ejs index dfa4a0c2a..18ea3242c 100644 --- a/generators/kotlin/templates/src/main/kotlin/_package_/GeneratedByJHipster.kt.ejs +++ b/generators/kotlin/templates/src/main/kotlin/_package_/GeneratedByJHipster.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/ktlint/templates/gradle/ktlint.gradle.ejs b/generators/ktlint/templates/gradle/ktlint.gradle.ejs index 89da51c75..d4d5c472b 100644 --- a/generators/ktlint/templates/gradle/ktlint.gradle.ejs +++ b/generators/ktlint/templates/gradle/ktlint.gradle.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/migration.cjs b/generators/spring-boot-v2/migration.cjs index 3c93505ec..cc6804377 100644 --- a/generators/spring-boot-v2/migration.cjs +++ b/generators/spring-boot-v2/migration.cjs @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/AuthorizedUserFeignClient.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/AuthorizedUserFeignClient.kt.ejs index e6256a0bb..cbe340210 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/AuthorizedUserFeignClient.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/AuthorizedUserFeignClient.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/OAuth2UserClientFeignConfiguration.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/OAuth2UserClientFeignConfiguration.kt.ejs index 53532e7ca..f443e9e20 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/OAuth2UserClientFeignConfiguration.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/OAuth2UserClientFeignConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/OAuth2_UserFeignClientInterceptor.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/OAuth2_UserFeignClientInterceptor.kt.ejs index b631a83e4..e0e75895f 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/OAuth2_UserFeignClientInterceptor.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/client/OAuth2_UserFeignClientInterceptor.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/config/LocaleConfiguration.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/config/LocaleConfiguration.kt.ejs index 9a7b3eed4..f8b4acf7a 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/config/LocaleConfiguration.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/config/LocaleConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/domain/Authority.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/domain/Authority.kt.ejs index 6b5ef830a..519a98139 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/domain/Authority.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/domain/Authority.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/repository/AuthorityRepository.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/repository/AuthorityRepository.kt.ejs index 2a000e07a..78bcf8732 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/repository/AuthorityRepository.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/repository/AuthorityRepository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/IatTokenEnhancer.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/IatTokenEnhancer.kt.ejs index a070d4f04..2c63dc546 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/IatTokenEnhancer.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/IatTokenEnhancer.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/JWTConfigurer.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/JWTConfigurer.kt.ejs index d6f7f517f..c8ffcc5ed 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/JWTConfigurer.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/JWTConfigurer.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/JWTFilter.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/JWTFilter.kt.ejs index 676ddc407..19e3d1316 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/JWTFilter.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/JWTFilter.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/TokenProvider.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/TokenProvider.kt.ejs index 7ad84fee3..c1e681229 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/TokenProvider.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/TokenProvider.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/CachedUserInfoTokenServices.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/CachedUserInfoTokenServices.kt.ejs index 7ee70f05d..56ca9210c 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/CachedUserInfoTokenServices.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/CachedUserInfoTokenServices.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/SimpleAuthoritiesExtractor.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/SimpleAuthoritiesExtractor.kt.ejs index caf1ad648..dc6410ad9 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/SimpleAuthoritiesExtractor.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/SimpleAuthoritiesExtractor.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/SimplePrincipalExtractor.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/SimplePrincipalExtractor.kt.ejs index c6b84f2a5..73af1be82 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/SimplePrincipalExtractor.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/oauth2/SimplePrincipalExtractor.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/web/rest/ClientForwardController.kt.ejs b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/web/rest/ClientForwardController.kt.ejs index 1739a12ec..922cd68c9 100644 --- a/generators/spring-boot-v2/templates/src/main/kotlin/_package_/web/rest/ClientForwardController.kt.ejs +++ b/generators/spring-boot-v2/templates/src/main/kotlin/_package_/web/rest/ClientForwardController.kt.ejs @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the " you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/test/kotlin/_package_/security/jwt/JWTFilterTest.kt.ejs b/generators/spring-boot-v2/templates/src/test/kotlin/_package_/security/jwt/JWTFilterTest.kt.ejs index 491cf25bc..b2ca10da0 100644 --- a/generators/spring-boot-v2/templates/src/test/kotlin/_package_/security/jwt/JWTFilterTest.kt.ejs +++ b/generators/spring-boot-v2/templates/src/test/kotlin/_package_/security/jwt/JWTFilterTest.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/test/kotlin/_package_/security/jwt/TokenProviderTest.kt.ejs b/generators/spring-boot-v2/templates/src/test/kotlin/_package_/security/jwt/TokenProviderTest.kt.ejs index 79094c78e..9cede5e51 100644 --- a/generators/spring-boot-v2/templates/src/test/kotlin/_package_/security/jwt/TokenProviderTest.kt.ejs +++ b/generators/spring-boot-v2/templates/src/test/kotlin/_package_/security/jwt/TokenProviderTest.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot-v2/templates/src/test/kotlin/_package_/web/rest/ClientForwardControllerTest.kt.ejs b/generators/spring-boot-v2/templates/src/test/kotlin/_package_/web/rest/ClientForwardControllerTest.kt.ejs index eb9810a3e..3415408a1 100644 --- a/generators/spring-boot-v2/templates/src/test/kotlin/_package_/web/rest/ClientForwardControllerTest.kt.ejs +++ b/generators/spring-boot-v2/templates/src/test/kotlin/_package_/web/rest/ClientForwardControllerTest.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/kotlin-constants.js b/generators/spring-boot/kotlin-constants.js index df38e4b69..98b8d20d8 100644 --- a/generators/spring-boot/kotlin-constants.js +++ b/generators/spring-boot/kotlin-constants.js @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/generators/spring-boot/needle-server-cache-kt.cjs b/generators/spring-boot/needle-server-cache-kt.cjs index 302c97ef5..c7d1acc65 100644 --- a/generators/spring-boot/needle-server-cache-kt.cjs +++ b/generators/spring-boot/needle-server-cache-kt.cjs @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/generators/spring-boot/needles.cjs b/generators/spring-boot/needles.cjs index 4fb14307d..7a7c9b9b6 100644 --- a/generators/spring-boot/needles.cjs +++ b/generators/spring-boot/needles.cjs @@ -4,7 +4,7 @@ * This file is part of the JHipster project, see https://www.jhipster.tech/ * for more information. * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/generators/spring-boot/templates/_global_partials_entity_/field_validators.ejs b/generators/spring-boot/templates/_global_partials_entity_/field_validators.ejs index bab8b3507..adc725be8 100644 --- a/generators/spring-boot/templates/_global_partials_entity_/field_validators.ejs +++ b/generators/spring-boot/templates/_global_partials_entity_/field_validators.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/_global_partials_entity_/it_patch_update.partial.kt.ejs b/generators/spring-boot/templates/_global_partials_entity_/it_patch_update.partial.kt.ejs index 44da56958..e279b9194 100644 --- a/generators/spring-boot/templates/_global_partials_entity_/it_patch_update.partial.kt.ejs +++ b/generators/spring-boot/templates/_global_partials_entity_/it_patch_update.partial.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/_global_partials_entity_/save_template.ejs b/generators/spring-boot/templates/_global_partials_entity_/save_template.ejs index 161a81c8b..70cb635f6 100644 --- a/generators/spring-boot/templates/_global_partials_entity_/save_template.ejs +++ b/generators/spring-boot/templates/_global_partials_entity_/save_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/_global_partials_entity_/update_template.ejs b/generators/spring-boot/templates/_global_partials_entity_/update_template.ejs index 74fec429b..a90d94cb7 100644 --- a/generators/spring-boot/templates/_global_partials_entity_/update_template.ejs +++ b/generators/spring-boot/templates/_global_partials_entity_/update_template.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/CucumberIT.kt.ejs b/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/CucumberIT.kt.ejs index c21bd605c..943d2cf76 100644 --- a/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/CucumberIT.kt.ejs +++ b/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/CucumberIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/CucumberTestContextConfiguration.kt.ejs b/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/CucumberTestContextConfiguration.kt.ejs index 41fed64fa..29ab0c74c 100644 --- a/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/CucumberTestContextConfiguration.kt.ejs +++ b/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/CucumberTestContextConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/stepdefs/StepDefs.kt.ejs b/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/stepdefs/StepDefs.kt.ejs index 4d330a0fb..ba7331b61 100644 --- a/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/stepdefs/StepDefs.kt.ejs +++ b/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/stepdefs/StepDefs.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/stepdefs/UserStepDefs.kt.ejs b/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/stepdefs/UserStepDefs.kt.ejs index f13eb6f72..bb15e3a08 100644 --- a/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/stepdefs/UserStepDefs.kt.ejs +++ b/generators/spring-boot/templates/cucumber/src/test/kotlin/_package_/cucumber/stepdefs/UserStepDefs.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/domain/_global_partials_entity_/field_validators.ejs b/generators/spring-boot/templates/domain/_global_partials_entity_/field_validators.ejs index bab8b3507..adc725be8 100644 --- a/generators/spring-boot/templates/domain/_global_partials_entity_/field_validators.ejs +++ b/generators/spring-boot/templates/domain/_global_partials_entity_/field_validators.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.ejs b/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.ejs index 0426ba595..effec5219 100644 --- a/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.ejs +++ b/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.ejs @@ -5,11 +5,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_validation.ejs b/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_validation.ejs index b4602ce7d..61eba6a59 100644 --- a/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_validation.ejs +++ b/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_validation.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/enumeration/_enumName_.kt.ejs b/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/enumeration/_enumName_.kt.ejs index fa3c68da2..c8e72db0c 100644 --- a/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/enumeration/_enumName_.kt.ejs +++ b/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/enumeration/_enumName_.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/domain/src/test/kotlin/_package_/_entityPackage_/domain/_persistClass_Test.kt.ejs b/generators/spring-boot/templates/domain/src/test/kotlin/_package_/_entityPackage_/domain/_persistClass_Test.kt.ejs index 4c41f95d2..120a6b2c6 100644 --- a/generators/spring-boot/templates/domain/src/test/kotlin/_package_/_entityPackage_/domain/_persistClass_Test.kt.ejs +++ b/generators/spring-boot/templates/domain/src/test/kotlin/_package_/_entityPackage_/domain/_persistClass_Test.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/AuthorizationHeaderUtil.kt.ejs b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/AuthorizationHeaderUtil.kt.ejs index cf0a21d49..294c49cfb 100644 --- a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/AuthorizationHeaderUtil.kt.ejs +++ b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/AuthorizationHeaderUtil.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/AuthorizedFeignClient.kt.ejs b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/AuthorizedFeignClient.kt.ejs index 39b045e73..75563f7b1 100644 --- a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/AuthorizedFeignClient.kt.ejs +++ b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/AuthorizedFeignClient.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/OAuth2InterceptedFeignConfiguration.kt.ejs b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/OAuth2InterceptedFeignConfiguration.kt.ejs index d679a0c5a..c22555716 100644 --- a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/OAuth2InterceptedFeignConfiguration.kt.ejs +++ b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/OAuth2InterceptedFeignConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/TokenRelayRequestInterceptor.kt.ejs b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/TokenRelayRequestInterceptor.kt.ejs index adeb0785b..23c24a203 100644 --- a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/TokenRelayRequestInterceptor.kt.ejs +++ b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/TokenRelayRequestInterceptor.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/UserFeignClientInterceptor_jwt.kt.ejs b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/UserFeignClientInterceptor_jwt.kt.ejs index 85527da3e..783c15e15 100644 --- a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/UserFeignClientInterceptor_jwt.kt.ejs +++ b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/client/UserFeignClientInterceptor_jwt.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/config/FeignConfiguration.kt.ejs b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/config/FeignConfiguration.kt.ejs index c1550795f..92dec3b97 100644 --- a/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/config/FeignConfiguration.kt.ejs +++ b/generators/spring-boot/templates/feign-client/src/main/kotlin/_package_/config/FeignConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/feign-client/src/test/kotlin/_package_/client/AuthorizationHeaderUtilTest.kt.ejs b/generators/spring-boot/templates/feign-client/src/test/kotlin/_package_/client/AuthorizationHeaderUtilTest.kt.ejs index 708590e60..27940e606 100644 --- a/generators/spring-boot/templates/feign-client/src/test/kotlin/_package_/client/AuthorizationHeaderUtilTest.kt.ejs +++ b/generators/spring-boot/templates/feign-client/src/test/kotlin/_package_/client/AuthorizationHeaderUtilTest.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/security/jwt/JWTRelayGatewayFilterFactory.kt.ejs b/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/security/jwt/JWTRelayGatewayFilterFactory.kt.ejs index 4ca83611d..a937a3dc8 100644 --- a/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/security/jwt/JWTRelayGatewayFilterFactory.kt.ejs +++ b/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/security/jwt/JWTRelayGatewayFilterFactory.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/web/rest/GatewayResource_reactive.kt.ejs b/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/web/rest/GatewayResource_reactive.kt.ejs index 606433678..64dfcccb5 100644 --- a/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/web/rest/GatewayResource_reactive.kt.ejs +++ b/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/web/rest/GatewayResource_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/web/rest/vm/RouteVM.kt.ejs b/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/web/rest/vm/RouteVM.kt.ejs index 74e69bbed..54f34c21d 100644 --- a/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/web/rest/vm/RouteVM.kt.ejs +++ b/generators/spring-boot/templates/gateway/src/main/kotlin/_package_/web/rest/vm/RouteVM.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaConsumer_imperative.kt.ejs b/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaConsumer_imperative.kt.ejs index c947aa45a..ad4069e57 100644 --- a/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaConsumer_imperative.kt.ejs +++ b/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaConsumer_imperative.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaConsumer_reactive.kt.ejs b/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaConsumer_reactive.kt.ejs index c947aa45a..ad4069e57 100644 --- a/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaConsumer_reactive.kt.ejs +++ b/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaConsumer_reactive.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaProducer.kt.ejs b/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaProducer.kt.ejs index c1d205eef..73c541aee 100644 --- a/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaProducer.kt.ejs +++ b/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/broker/KafkaProducer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/web/rest/KafkaResource_imperative.kt.ejs b/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/web/rest/KafkaResource_imperative.kt.ejs index c93a1dbc2..6f911ca1d 100644 --- a/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/web/rest/KafkaResource_imperative.kt.ejs +++ b/generators/spring-boot/templates/kafka/src/main/kotlin/_package_/web/rest/KafkaResource_imperative.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/EmbeddedKafka.kt.ejs b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/EmbeddedKafka.kt.ejs index b47299d61..9403901e8 100644 --- a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/EmbeddedKafka.kt.ejs +++ b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/EmbeddedKafka.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs index 2b37a02fe..db39544f6 100644 --- a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs +++ b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/web/rest/KafkaResourceIT_imperative.kt.ejs b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/web/rest/KafkaResourceIT_imperative.kt.ejs index bdf430d09..1f624889a 100644 --- a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/web/rest/KafkaResourceIT_imperative.kt.ejs +++ b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/web/rest/KafkaResourceIT_imperative.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/liquibase/src/main/kotlin/_package_/config/LiquibaseConfiguration.kt.ejs b/generators/spring-boot/templates/liquibase/src/main/kotlin/_package_/config/LiquibaseConfiguration.kt.ejs index b96c83f5f..572e2293c 100644 --- a/generators/spring-boot/templates/liquibase/src/main/kotlin/_package_/config/LiquibaseConfiguration.kt.ejs +++ b/generators/spring-boot/templates/liquibase/src/main/kotlin/_package_/config/LiquibaseConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/pom.xml.ejs b/generators/spring-boot/templates/pom.xml.ejs index 212fb8b97..07876c9ee 100644 --- a/generators/spring-boot/templates/pom.xml.ejs +++ b/generators/spring-boot/templates/pom.xml.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/reactive/_global_partials_entity_/save_template.ejs b/generators/spring-boot/templates/reactive/_global_partials_entity_/save_template.ejs index 2439e2e70..89792bfbf 100644 --- a/generators/spring-boot/templates/reactive/_global_partials_entity_/save_template.ejs +++ b/generators/spring-boot/templates/reactive/_global_partials_entity_/save_template.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/reactive/_global_partials_entity_/update_template.ejs b/generators/spring-boot/templates/reactive/_global_partials_entity_/update_template.ejs index a381887cc..244621211 100644 --- a/generators/spring-boot/templates/reactive/_global_partials_entity_/update_template.ejs +++ b/generators/spring-boot/templates/reactive/_global_partials_entity_/update_template.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheConfiguration.kt.ejs b/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheConfiguration.kt.ejs index 744e6a8eb..1097e8281 100644 --- a/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheFactoryConfiguration.kt.ejs b/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheFactoryConfiguration.kt.ejs index f6492db29..f0f132285 100644 --- a/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheFactoryConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheFactoryConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-cache/src/test/kotlin/_package_/config/EmbeddedRedis.kt.ejs b/generators/spring-boot/templates/spring-cache/src/test/kotlin/_package_/config/EmbeddedRedis.kt.ejs index 585458110..5da4a6954 100644 --- a/generators/spring-boot/templates/spring-cache/src/test/kotlin/_package_/config/EmbeddedRedis.kt.ejs +++ b/generators/spring-boot/templates/spring-cache/src/test/kotlin/_package_/config/EmbeddedRedis.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_cassandra.ejs b/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_cassandra.ejs index 473c7b83b..1237ad414 100644 --- a/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_cassandra.ejs +++ b/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_cassandra.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs b/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs index 8f6e98cfd..3306857a1 100644 --- a/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs +++ b/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs b/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs index 36fb18824..6dc9ffcc2 100644 --- a/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/CassandraKeyspaceIT.kt.ejs b/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/CassandraKeyspaceIT.kt.ejs index 5a3821c5b..992824e61 100644 --- a/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/CassandraKeyspaceIT.kt.ejs +++ b/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/CassandraKeyspaceIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/config/CassandraTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/config/CassandraTestContainer.kt.ejs index 54857dc89..89cb4e0bf 100644 --- a/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/config/CassandraTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/config/CassandraTestContainer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-couchbase/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs b/generators/spring-boot/templates/spring-data-couchbase/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs index f2536bc6a..dc7a7b01a 100644 --- a/generators/spring-boot/templates/spring-data-couchbase/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-data-couchbase/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-couchbase/src/main/kotlin/_package_/repository/PersistentTokenRepository_couchbase.kt.ejs b/generators/spring-boot/templates/spring-data-couchbase/src/main/kotlin/_package_/repository/PersistentTokenRepository_couchbase.kt.ejs index b2b91b057..49a35d03e 100644 --- a/generators/spring-boot/templates/spring-data-couchbase/src/main/kotlin/_package_/repository/PersistentTokenRepository_couchbase.kt.ejs +++ b/generators/spring-boot/templates/spring-data-couchbase/src/main/kotlin/_package_/repository/PersistentTokenRepository_couchbase.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/CouchbaseTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/CouchbaseTestContainer.kt.ejs index fc450ed94..62537dc1c 100644 --- a/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/CouchbaseTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/CouchbaseTestContainer.kt.ejs @@ -8,7 +8,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/EmbeddedCouchbase.kt.ejs b/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/EmbeddedCouchbase.kt.ejs index c5c0461b8..be517a69a 100644 --- a/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/EmbeddedCouchbase.kt.ejs +++ b/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/EmbeddedCouchbase.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.elastic_search.ejs b/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.elastic_search.ejs index f26ad485f..efb9bca67 100644 --- a/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.elastic_search.ejs +++ b/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.elastic_search.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.kt.ejs b/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.kt.ejs index 7b4e028c8..0f14eb792 100644 --- a/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.kt.ejs +++ b/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/config/ElasticsearchConfiguration.kt.ejs b/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/config/ElasticsearchConfiguration.kt.ejs index 485f0efe8..05d59caca 100644 --- a/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/config/ElasticsearchConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/config/ElasticsearchConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/repository/search/UserSearchRepository.kt.ejs b/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/repository/search/UserSearchRepository.kt.ejs index 4c32bc8d5..bab3ba2e5 100644 --- a/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/repository/search/UserSearchRepository.kt.ejs +++ b/generators/spring-boot/templates/spring-data-elasticsearch/src/main/kotlin/_package_/repository/search/UserSearchRepository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestConfiguration.kt.ejs b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestConfiguration.kt.ejs index e87e3fed4..526411d94 100644 --- a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestConfiguration.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs index e93f3700c..193b32e92 100644 --- a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/EmbeddedElasticsearch.kt.ejs b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/EmbeddedElasticsearch.kt.ejs index 4aa2c2efb..512076bf2 100644 --- a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/EmbeddedElasticsearch.kt.ejs +++ b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/EmbeddedElasticsearch.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs b/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs index ecd25b48a..37a9d4f45 100644 --- a/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs +++ b/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.kt.ejs b/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.kt.ejs index df66da160..5a7efd884 100644 --- a/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.kt.ejs +++ b/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs b/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs index e9735d000..7731093cb 100644 --- a/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/config/dbmigrations/InitialSetupMigration.kt.ejs b/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/config/dbmigrations/InitialSetupMigration.kt.ejs index d1c8adfbe..630ec977b 100644 --- a/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/config/dbmigrations/InitialSetupMigration.kt.ejs +++ b/generators/spring-boot/templates/spring-data-mongodb/src/main/kotlin/_package_/config/dbmigrations/InitialSetupMigration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-mongodb/src/test/kotlin/_package_/config/EmbeddedMongo.kt.ejs b/generators/spring-boot/templates/spring-data-mongodb/src/test/kotlin/_package_/config/EmbeddedMongo.kt.ejs index a5df314fa..d08801981 100644 --- a/generators/spring-boot/templates/spring-data-mongodb/src/test/kotlin/_package_/config/EmbeddedMongo.kt.ejs +++ b/generators/spring-boot/templates/spring-data-mongodb/src/test/kotlin/_package_/config/EmbeddedMongo.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs b/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs index 445b72d6c..9dfe369da 100644 --- a/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs +++ b/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/config/DatabaseConfiguration.kt_neo4j.ejs b/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/config/DatabaseConfiguration.kt_neo4j.ejs index 4c3708488..661cb1247 100644 --- a/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/config/DatabaseConfiguration.kt_neo4j.ejs +++ b/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/config/DatabaseConfiguration.kt_neo4j.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/config/neo4j/Neo4jMigrations.kt.ejs b/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/config/neo4j/Neo4jMigrations.kt.ejs index 63294a867..8ae548ee4 100644 --- a/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/config/neo4j/Neo4jMigrations.kt.ejs +++ b/generators/spring-boot/templates/spring-data-neo4j/src/main/kotlin/_package_/config/neo4j/Neo4jMigrations.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/EmbeddedNeo4j.kt.ejs b/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/EmbeddedNeo4j.kt.ejs index e1af762a3..9deb609fd 100644 --- a/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/EmbeddedNeo4j.kt.ejs +++ b/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/EmbeddedNeo4j.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs index 5c21e4d10..e38aed20a 100644 --- a/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.hibernate_cache.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.hibernate_cache.ejs index 631ebb4da..596768a5a 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.hibernate_cache.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.hibernate_cache.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_lifecycle_events.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_lifecycle_events.ejs index 7539886b4..c51dab29b 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_lifecycle_events.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_lifecycle_events.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_persistence.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_persistence.ejs index 64d15aff8..0e548fd29 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_persistence.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_persistence.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_persistable.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_persistable.ejs index 4b5f2c50d..a1618ef26 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_persistable.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_persistable.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_reactive.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_reactive.ejs index e2be46e47..4d3df3d2b 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_reactive.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.spring_data_reactive.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_Callback.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_Callback.kt.ejs index e92c71d79..9bfccc0d8 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_Callback.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_Callback.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/relationship_validators.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/relationship_validators.ejs index 66b349191..81ceafe0f 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/relationship_validators.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/relationship_validators.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs index 9420fc139..f686bc932 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryInternalImpl_reactive.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryInternalImpl_reactive.kt.ejs index 5ca776f8b..070803b47 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryInternalImpl_reactive.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryInternalImpl_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationships.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationships.kt.ejs index 7d1bea5ab..34df28a0d 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationships.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationships.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.kt.ejs index b23ef076e..e8799f37d 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_SqlHelper_reactive.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_SqlHelper_reactive.kt.ejs index 829257232..81e81786e 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_SqlHelper_reactive.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_SqlHelper_reactive.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/rowmapper/_entityClass_RowMapper_reactive.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/rowmapper/_entityClass_RowMapper_reactive.kt.ejs index 769078bd3..d3a256ed7 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/rowmapper/_entityClass_RowMapper_reactive.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/rowmapper/_entityClass_RowMapper_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs index e9130779d..f3bcd0ef6 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/EntityManager_reactive.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/EntityManager_reactive.kt.ejs index 6555afbf9..9f7e956b4 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/EntityManager_reactive.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/EntityManager_reactive.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/UserSqlHelper_reactive.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/UserSqlHelper_reactive.kt.ejs index 010846368..69349c40d 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/UserSqlHelper_reactive.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/UserSqlHelper_reactive.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/rowmapper/ColumnConverter_reactive.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/rowmapper/ColumnConverter_reactive.kt.ejs index d2938f150..621774f13 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/rowmapper/ColumnConverter_reactive.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/rowmapper/ColumnConverter_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/rowmapper/UserRowMapper_reactive.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/rowmapper/UserRowMapper_reactive.kt.ejs index 58e1e192c..6c7e7f2b9 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/rowmapper/UserRowMapper_reactive.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/repository/rowmapper/UserRowMapper_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/EmbeddedSQL.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/EmbeddedSQL.kt.ejs index 746fe7afc..bb7a15635 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/EmbeddedSQL.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/EmbeddedSQL.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MariadbTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MariadbTestContainer.kt.ejs index db83b86d1..a2c90e0c3 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MariadbTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MariadbTestContainer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs index df56aa70e..51ea66f20 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MysqlTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MysqlTestContainer.kt.ejs index bda856b46..5cbcaae6e 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MysqlTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MysqlTestContainer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs index 5d9cd40eb..362d3ecde 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/SqlTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/SqlTestContainer.kt.ejs index 6e72793a4..e5e28ec17 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/SqlTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/SqlTestContainer.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/timezone/HibernateTimeZoneIT.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/timezone/HibernateTimeZoneIT.kt.ejs index 552b296ba..f58db4678 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/timezone/HibernateTimeZoneIT.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/timezone/HibernateTimeZoneIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapper.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapper.kt.ejs index 3286e31d4..3d92271d7 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapper.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapper.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapperRepository.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapperRepository.kt.ejs index f740f5c8b..8887764e2 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapperRepository.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapperRepository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/resources/config/application-testdev.yml.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/resources/config/application-testdev.yml.ejs index 61f33b307..0a7fdc74f 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/resources/config/application-testdev.yml.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/resources/config/application-testdev.yml.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/resources/config/application-testprod.yml.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/resources/config/application-testprod.yml.ejs index 98cf82213..099849987 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/resources/config/application-testprod.yml.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/resources/config/application-testprod.yml.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/config/WebsocketConfiguration.kt.ejs b/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/config/WebsocketConfiguration.kt.ejs index f833bbff6..138e68803 100644 --- a/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/config/WebsocketConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/config/WebsocketConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/config/WebsocketSecurityConfiguration.kt.ejs b/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/config/WebsocketSecurityConfiguration.kt.ejs index 4e6870d86..d29158ef1 100644 --- a/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/config/WebsocketSecurityConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/config/WebsocketSecurityConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/web/websocket/ActivityService.kt.ejs b/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/web/websocket/ActivityService.kt.ejs index 41f9bd4f6..414a8f107 100644 --- a/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/web/websocket/ActivityService.kt.ejs +++ b/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/web/websocket/ActivityService.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/web/websocket/dto/ActivityDTO.kt.ejs b/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/web/websocket/dto/ActivityDTO.kt.ejs index 13998a7b4..ad2187c91 100644 --- a/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/web/websocket/dto/ActivityDTO.kt.ejs +++ b/generators/spring-boot/templates/spring-websocket/src/main/kotlin/_package_/web/websocket/dto/ActivityDTO.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/Application.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/Application.kt.ejs index d94095395..2c5782e22 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/Application.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/Application.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/ApplicationWebXml.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/ApplicationWebXml.kt.ejs index 02f45241a..f87edb389 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/ApplicationWebXml.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/ApplicationWebXml.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/delete_template.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/delete_template.ejs index ac2d0901d..156976f2b 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/delete_template.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/delete_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs index 6987b7c6e..8a8b49d29 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs index e5be98066..5df3ccb49 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs index c4749a72b..d7a9c619c 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_template.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_template.ejs index 784ddd9fd..69b0c9608 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_template.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/get_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/inject_template.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/inject_template.ejs index f83028468..56971fadc 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/inject_template.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/inject_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/patch_template.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/patch_template.ejs index 897421e7d..e0e305db1 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/patch_template.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/patch_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/search_stream_template.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/search_stream_template.ejs index 05cb1bdba..0d2e9074f 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/search_stream_template.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/search_stream_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/search_template.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/search_template.ejs index 43a799eeb..ddb687cf5 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/search_template.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/_partials_entity_/search_template.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/repository/UserRepository.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/repository/UserRepository.kt.ejs index 9ad403eca..9b8651acf 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/repository/UserRepository.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/repository/UserRepository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/UserService.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/UserService.kt.ejs index 274a1549e..ea59e94e2 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/UserService.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/UserService.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs index 7d83ac8f1..c4b991fdf 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_Service.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_Service.kt.ejs index 23676a3fb..c2bcb5240 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_Service.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_Service.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.kt.ejs index 06b7ed3a2..3e86ff413 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs index 57effb0a2..288cbc3ec 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.kt.ejs index 30e9e1670..aa1178617 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/EntityMapper.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/EntityMapper.kt.ejs index 3944e2fc2..ca1273460 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/EntityMapper.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/EntityMapper.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.kt.ejs index 8282d6266..c45e00489 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/PublicUserResource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/PublicUserResource.kt.ejs index 4133e74be..20a6af2e5 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/PublicUserResource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/PublicUserResource.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs index 52fe2088c..e300b9c0c 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/_entityClass_Resource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/_entityClass_Resource.kt.ejs index 5f87930c2..358565fe3 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/_entityClass_Resource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/_entityClass_Resource.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/aop/logging/LoggingAspect.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/aop/logging/LoggingAspect.kt.ejs index 9f436b5e2..4e721ad2e 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/aop/logging/LoggingAspect.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/aop/logging/LoggingAspect.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/ApplicationProperties.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/ApplicationProperties.kt.ejs index 161afd019..3042409e1 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/ApplicationProperties.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/ApplicationProperties.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/AsyncConfiguration.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/AsyncConfiguration.kt.ejs index 19b1b3c58..2be2476e0 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/AsyncConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/AsyncConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/Constants.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/Constants.kt.ejs index 06c4b2840..a87dc4e39 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/Constants.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/Constants.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/DateTimeFormatConfiguration.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/DateTimeFormatConfiguration.kt.ejs index bc5576cf3..ed5f76447 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/DateTimeFormatConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/DateTimeFormatConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/EurekaWorkaroundConfiguration.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/EurekaWorkaroundConfiguration.kt.ejs index 512d46865..a1253f25d 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/EurekaWorkaroundConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/EurekaWorkaroundConfiguration.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/JacksonConfiguration.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/JacksonConfiguration.kt.ejs index b1f2a6039..089628ca4 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/JacksonConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/JacksonConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/LoggingAspectConfiguration.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/LoggingAspectConfiguration.kt.ejs index 0dfc45f9b..bff9c4558 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/LoggingAspectConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/LoggingAspectConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/LoggingConfiguration.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/LoggingConfiguration.kt.ejs index 5221acc19..f78f1a575 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/LoggingConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/LoggingConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/OpenApiConfiguration.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/OpenApiConfiguration.kt.ejs index 94fb44649..14d6593fb 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/OpenApiConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/OpenApiConfiguration.kt.ejs @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the " you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 +https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/SecurityConfiguration_imperative.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/SecurityConfiguration_imperative.kt.ejs index 85b16f440..0e751e441 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/SecurityConfiguration_imperative.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/SecurityConfiguration_imperative.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/SecurityConfiguration_reactive.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/SecurityConfiguration_reactive.kt.ejs index 315a7a678..ace2c9d47 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/SecurityConfiguration_reactive.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/SecurityConfiguration_reactive.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/StaticResourcesWebConfiguration.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/StaticResourcesWebConfiguration.kt.ejs index fc3b4be01..b8f6005d7 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/StaticResourcesWebConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/StaticResourcesWebConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/WebConfigurer.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/WebConfigurer.kt.ejs index a18386f2a..c75ea0864 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/WebConfigurer.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/WebConfigurer.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/AbstractAuditingEntity.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/AbstractAuditingEntity.kt.ejs index 183aeba6c..0f01d0c81 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/AbstractAuditingEntity.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/AbstractAuditingEntity.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/PersistentToken.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/PersistentToken.kt.ejs index a4adfcc0c..426365269 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/PersistentToken.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/PersistentToken.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/User.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/User.kt.ejs index e98c8ebd6..0e027b461 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/User.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/User.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/management/SecurityMetersService.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/management/SecurityMetersService.kt.ejs index 1d71b2694..c2b331896 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/management/SecurityMetersService.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/management/SecurityMetersService.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/repository/PersistentTokenRepository.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/repository/PersistentTokenRepository.kt.ejs index d90af9e01..6d65cfdfc 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/repository/PersistentTokenRepository.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/repository/PersistentTokenRepository.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/security/AuthoritiesConstants.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/security/AuthoritiesConstants.kt.ejs index 161b9ecbe..093027971 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/security/AuthoritiesConstants.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/security/AuthoritiesConstants.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/security/DomainUserDetailsService.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/security/DomainUserDetailsService.kt.ejs index 4fe2c8d4c..c0c848eb4 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/security/DomainUserDetailsService.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/security/DomainUserDetailsService.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/security/PersistentTokenRememberMeServices.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/security/PersistentTokenRememberMeServices.kt.ejs index 150d88324..66afea306 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/security/PersistentTokenRememberMeServices.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/security/PersistentTokenRememberMeServices.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/security/SecurityUtils.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/security/SecurityUtils.kt.ejs index 4aa46a96b..15d2ef6be 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/security/SecurityUtils.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/security/SecurityUtils.kt.ejs @@ -8,7 +8,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/security/SpringSecurityAuditorAware.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/security/SpringSecurityAuditorAware.kt.ejs index 8a42517f9..2c5b05f8c 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/security/SpringSecurityAuditorAware.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/security/SpringSecurityAuditorAware.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/security/UserNotActivatedException.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/security/UserNotActivatedException.kt.ejs index ac4d9d74c..630b57a82 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/security/UserNotActivatedException.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/security/UserNotActivatedException.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/security/oauth2/AudienceValidator.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/security/oauth2/AudienceValidator.kt.ejs index c4879a833..c5b08e17b 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/security/oauth2/AudienceValidator.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/security/oauth2/AudienceValidator.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/security/oauth2/CustomClaimConverter.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/security/oauth2/CustomClaimConverter.kt.ejs index ae07b02af..8ab1f73c1 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/security/oauth2/CustomClaimConverter.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/security/oauth2/CustomClaimConverter.kt.ejs @@ -8,7 +8,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/EmailAlreadyUsedException.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/EmailAlreadyUsedException.kt.ejs index 4e7b53f18..8255e0bfc 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/EmailAlreadyUsedException.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/EmailAlreadyUsedException.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/InvalidPasswordException.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/InvalidPasswordException.kt.ejs index b4c0982d6..faf0abe00 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/InvalidPasswordException.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/InvalidPasswordException.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs index cb0e6127f..eaa5dff0b 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/UsernameAlreadyUsedException.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/UsernameAlreadyUsedException.kt.ejs index d5bdc7a92..cf0a87283 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/UsernameAlreadyUsedException.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/UsernameAlreadyUsedException.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/AdminUserDTO.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/AdminUserDTO.kt.ejs index f4c835092..ea39633b0 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/AdminUserDTO.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/AdminUserDTO.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/PasswordChangeDTO.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/PasswordChangeDTO.kt.ejs index b9349db0a..7c3c7f625 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/PasswordChangeDTO.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/PasswordChangeDTO.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/UserDTO.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/UserDTO.kt.ejs index b1b41bd73..e7e566c84 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/UserDTO.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/UserDTO.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/mapper/UserMapper.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/mapper/UserMapper.kt.ejs index bcf63db0b..fa19ae59d 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/mapper/UserMapper.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/mapper/UserMapper.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/filter/SpaWebFilter_reactive.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/filter/SpaWebFilter_reactive.kt.ejs index d557af443..e2cb6be7b 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/filter/SpaWebFilter_reactive.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/filter/SpaWebFilter_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs index b3490d42f..4899c75f5 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the " you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthInfoResource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthInfoResource.kt.ejs index 0e7286349..a5407e19c 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthInfoResource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthInfoResource.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see http://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthenticateController.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthenticateController.kt.ejs index e924bb5e3..8348085a1 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthenticateController.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthenticateController.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_imperative.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_imperative.kt.ejs index 12834752e..6ffe1b8b2 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_imperative.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_imperative.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_reactive.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_reactive.kt.ejs index 63f4ed24d..6a1e471f0 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_reactive.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/BadRequestAlertException.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/BadRequestAlertException.kt.ejs index 35829bb5c..d7259a5a9 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/BadRequestAlertException.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/BadRequestAlertException.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/EmailAlreadyUsedException.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/EmailAlreadyUsedException.kt.ejs index 47ef763f0..b814bfcde 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/EmailAlreadyUsedException.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/EmailAlreadyUsedException.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ErrorConstants.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ErrorConstants.kt.ejs index 7048f1f32..f88a85a63 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ErrorConstants.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ErrorConstants.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ExceptionTranslator.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ExceptionTranslator.kt.ejs index 49d25af1e..4208726e6 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ExceptionTranslator.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ExceptionTranslator.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/FieldErrorVM.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/FieldErrorVM.kt.ejs index 112594032..e1b6793ae 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/FieldErrorVM.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/FieldErrorVM.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/InvalidPasswordException.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/InvalidPasswordException.kt.ejs index cc94c8f19..565e908b0 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/InvalidPasswordException.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/InvalidPasswordException.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/LoginAlreadyUsedException.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/LoginAlreadyUsedException.kt.ejs index 7f50c2b0c..d0b025867 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/LoginAlreadyUsedException.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/LoginAlreadyUsedException.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/KeyAndPasswordVM.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/KeyAndPasswordVM.kt.ejs index 5ead0324f..a44ee590d 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/KeyAndPasswordVM.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/KeyAndPasswordVM.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/LoginVM.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/LoginVM.kt.ejs index 535bed618..79f8820e7 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/LoginVM.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/LoginVM.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/ManagedUserVM.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/ManagedUserVM.kt.ejs index c6b2b70d0..8754ef37c 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/ManagedUserVM.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/ManagedUserVM.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/IntegrationTest.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/IntegrationTest.kt.ejs index 0031a0c4e..b7a6c5a78 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/IntegrationTest.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/IntegrationTest.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/UserServiceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/UserServiceIT.kt.ejs index 8123d46b2..3ce221478 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/UserServiceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/UserServiceIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_Test.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_Test.kt.ejs index 507fc8b25..f92b05653 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_Test.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_Test.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.kt.ejs index 733c34ff0..7132f83c2 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/PublicUserResourceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/PublicUserResourceIT.kt.ejs index ae61ea8ab..fd19260d4 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/PublicUserResourceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/PublicUserResourceIT.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/UserResourceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/UserResourceIT.kt.ejs index 6159962d9..cdb8b822f 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/UserResourceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/UserResourceIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.kt.ejs index a18b3c844..e0b6aca6e 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/config/AsyncSyncConfiguration.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/config/AsyncSyncConfiguration.kt.ejs index d570b32c4..148c3907e 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/config/AsyncSyncConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/config/AsyncSyncConfiguration.kt.ejs @@ -4,7 +4,7 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/config/JHipsterBlockHoundIntegration.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/config/JHipsterBlockHoundIntegration.kt.ejs index 58fccde7d..26ba43291 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/config/JHipsterBlockHoundIntegration.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/config/JHipsterBlockHoundIntegration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/config/StaticResourcesWebConfigurerTest.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/config/StaticResourcesWebConfigurerTest.kt.ejs index ed105d885..5038bf77f 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/config/StaticResourcesWebConfigurerTest.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/config/StaticResourcesWebConfigurerTest.kt.ejs @@ -8,7 +8,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/config/TestSecurityConfiguration.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/config/TestSecurityConfiguration.kt.ejs index 1dd8b521b..8755acaa3 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/config/TestSecurityConfiguration.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/config/TestSecurityConfiguration.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTest.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTest.kt.ejs index ac84ac9a4..01f6ab92b 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTest.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTest.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTestController.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTestController.kt.ejs index 65213bfff..717add597 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTestController.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTestController.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/security/DomainUserDetailsServiceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/security/DomainUserDetailsServiceIT.kt.ejs index e80dbe4fa..33bb283a5 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/security/DomainUserDetailsServiceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/security/DomainUserDetailsServiceIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/security/SecurityUtilsUnitTest_imperative.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/security/SecurityUtilsUnitTest_imperative.kt.ejs index 1f2a4876b..4d0edc1db 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/security/SecurityUtilsUnitTest_imperative.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/security/SecurityUtilsUnitTest_imperative.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/security/oauth2/AudienceValidatorTest.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/security/oauth2/AudienceValidatorTest.kt.ejs index b945a0453..2a668e933 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/security/oauth2/AudienceValidatorTest.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/security/oauth2/AudienceValidatorTest.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://jhipster.github.io/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/security/oauth2/CustomClaimConverterIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/security/oauth2/CustomClaimConverterIT.kt.ejs index a3c6ef0d7..45d2ff7f1 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/security/oauth2/CustomClaimConverterIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/security/oauth2/CustomClaimConverterIT.kt.ejs @@ -8,7 +8,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs index 6ef0b28ca..c9feb9832 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/service/mapper/UserMapperTest.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/service/mapper/UserMapperTest.kt.ejs index 1f0302327..3ace330c3 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/service/mapper/UserMapperTest.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/service/mapper/UserMapperTest.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT.kt.ejs index 98301777d..5ec452f4c 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT_oauth2.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT_oauth2.kt.ejs index eba94c9a0..749a83c8f 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT_oauth2.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT_oauth2.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT_skipUserManagement.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT_skipUserManagement.kt.ejs index fab7cc3ba..0780d32a2 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT_skipUserManagement.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AccountResourceIT_skipUserManagement.kt.ejs @@ -8,7 +8,7 @@ This file is part of the JHipster project, see https://jhipster.github.io/ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AuthenticateControllerIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AuthenticateControllerIT.kt.ejs index 9555b7931..1022a6e19 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AuthenticateControllerIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/AuthenticateControllerIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/LogoutResourceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/LogoutResourceIT.kt.ejs index b0b17cc27..dc17c3912 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/LogoutResourceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/LogoutResourceIT.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/TestUtil.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/TestUtil.kt.ejs index 0ccd8bb8c..196718efc 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/TestUtil.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/TestUtil.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/WithUnauthenticatedMockUser.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/WithUnauthenticatedMockUser.kt.ejs index 3166b33b3..988307352 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/WithUnauthenticatedMockUser.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/WithUnauthenticatedMockUser.kt.ejs @@ -8,7 +8,7 @@ for more information. you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.kt.ejs index a26105ee0..0517cd080 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.kt.ejs index b3056c09f..1d37699ad 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorTestController.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorTestController.kt.ejs index 928e273f5..58ebe7dc1 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorTestController.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorTestController.kt.ejs @@ -4,11 +4,11 @@ This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. - Licensed under the Apache License, Version 2.0 (the " + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, From 90c201e1cdf281e4f5801dba1da4ccfafb16e147 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 20:57:13 -0300 Subject: [PATCH 03/10] apply dockerContainers --- generators/spring-boot-v2/preparing-migration.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generators/spring-boot-v2/preparing-migration.js b/generators/spring-boot-v2/preparing-migration.js index f677223e3..5c00d0630 100644 --- a/generators/spring-boot-v2/preparing-migration.js +++ b/generators/spring-boot-v2/preparing-migration.js @@ -80,6 +80,7 @@ export const migrateApplicationTask = asWritingTask(async function ({ applicatio Object.assign(application.dockerContainers, { elasticsearchTag: ELASTICSEARCH_VERSION, elasticsearch: `${DOCKER_ELASTICSEARCH_CONTAINER}:${ELASTICSEARCH_VERSION}`, + ...jhipster7DockerContainers, }); Object.assign(application.javaDependencies, javaDependenciesOverrides); @@ -88,7 +89,7 @@ export const migrateApplicationTask = asWritingTask(async function ({ applicatio }); const dockerContainersVersions = Object.fromEntries( - Object.entries({ ...application.dockerContainers, ...jhipster7DockerContainers }).map(([containerName, container]) => [ + Object.entries(application.dockerContainers).map(([containerName, container]) => [ `DOCKER_${this._.snakeCase(containerName).toUpperCase().replace('_4_', '4')}`, container, ]), From 2c3a81f81c149e4967e3e819918cdd07df0dcb8d Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 21:08:47 -0300 Subject: [PATCH 04/10] more jakarta migration --- .../_package_/GeneratedByJHipster.kt.ejs | 2 +- ...ersistClass_.kt.jhi.jakarta_validation.ejs | 2 +- .../config/CacheConfiguration.kt.ejs | 2 +- .../config/DatabaseConfiguration.kt.ejs | 2 +- .../ElasticsearchTestConfiguration.kt.ejs | 2 +- ...rsistClass_.kt.jhi.jakarta_persistence.ejs | 2 +- ..._RepositoryWithBagRelationshipsImpl.kt.ejs | 4 +-- .../timezone/DateTimeWrapper.kt.ejs | 2 +- .../main/kotlin/_package_/Application.kt.ejs | 2 +- .../repository/UserRepository.kt.ejs | 6 ++-- .../service/_entityClass_QueryService.kt.ejs | 2 +- .../service/dto/_dtoClass_.kt.ejs | 4 +-- .../web/rest/UserResource.kt.ejs | 4 +-- .../web/rest/_entityClass_Resource.kt.ejs | 4 +-- .../_package_/config/WebConfigurer.kt.ejs | 6 ++-- .../domain/AbstractAuditingEntity.kt.ejs | 6 ++-- .../_package_/domain/PersistentToken.kt.ejs | 16 +++++----- .../main/kotlin/_package_/domain/User.kt.ejs | 32 +++++++++---------- .../PersistentTokenRepository.kt.ejs | 4 +-- .../PersistentTokenRememberMeServices.kt.ejs | 4 +-- .../_package_/service/MailService.kt.ejs | 2 +- .../_package_/service/dto/AdminUserDTO.kt.ejs | 2 +- .../OAuth2RefreshTokensWebFilter.kt.ejs | 8 ++--- .../_package_/web/rest/AccountResource.kt.ejs | 8 ++--- .../web/rest/AuthenticateController.kt.ejs | 2 +- .../web/rest/LogoutResource_imperative.kt.ejs | 2 +- .../rest/errors/ExceptionTranslator.kt.ejs | 2 +- .../_package_/web/rest/vm/LoginVM.kt.ejs | 4 +-- .../web/rest/vm/ManagedUserVM.kt.ejs | 2 +- .../web/rest/PublicUserResourceIT.kt.ejs | 2 +- .../web/rest/UserResourceIT.kt.ejs | 2 +- .../web/rest/_entityClass_ResourceIT.kt.ejs | 2 +- .../_package_/config/WebConfigurerTest.kt.ejs | 10 +++--- .../_package_/service/MailServiceIT.kt.ejs | 10 +++--- .../kotlin/_package_/web/rest/TestUtil.kt.ejs | 2 +- .../ExceptionTranslatorTestController.kt.ejs | 4 +-- 36 files changed, 86 insertions(+), 86 deletions(-) diff --git a/generators/kotlin/templates/src/main/kotlin/_package_/GeneratedByJHipster.kt.ejs b/generators/kotlin/templates/src/main/kotlin/_package_/GeneratedByJHipster.kt.ejs index 18ea3242c..97cfb1226 100644 --- a/generators/kotlin/templates/src/main/kotlin/_package_/GeneratedByJHipster.kt.ejs +++ b/generators/kotlin/templates/src/main/kotlin/_package_/GeneratedByJHipster.kt.ejs @@ -23,7 +23,7 @@ import java.lang.annotation.Retention import java.lang.annotation.RetentionPolicy import java.lang.annotation.Target -import javax.annotation.Generated +import jakarta.annotation.Generated @Generated(value= ["JHipster"], comments="Generated by JHipster <%= jhipsterVersion %>") @Retention(RetentionPolicy.SOURCE) diff --git a/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_validation.ejs b/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_validation.ejs index 61eba6a59..fc780a069 100644 --- a/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_validation.ejs +++ b/generators/spring-boot/templates/domain/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_validation.ejs @@ -22,7 +22,7 @@ -%> <&_ if (fragment.importSection) { -&> <%_ if (anyPropertyHasValidation) { _%> -import javax.validation.constraints.* +import jakarta.validation.constraints.* <%_ } _%> <&_ } -&> diff --git a/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheConfiguration.kt.ejs b/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheConfiguration.kt.ejs index 1097e8281..38eb6c1bb 100644 --- a/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-cache/src/main/kotlin/_package_/config/CacheConfiguration.kt.ejs @@ -98,7 +98,7 @@ import org.springframework.context.annotation.Configuration import org.springframework.core.env.Environment import org.springframework.core.env.Profiles -import javax.annotation.PreDestroy +import jakarta.annotation.PreDestroy <%_ } _%> <%_ if (cacheProviderInfinispan) { _%> import org.infinispan.configuration.cache.CacheMode diff --git a/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs b/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs index 6dc9ffcc2..20819f200 100644 --- a/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-data-cassandra/src/main/kotlin/_package_/config/DatabaseConfiguration.kt.ejs @@ -30,7 +30,7 @@ import org.springframework.data.cassandra.core.convert.CassandraCustomConversion import org.springframework.data.convert.ReadingConverter import org.springframework.data.convert.WritingConverter -import javax.annotation.Nonnull +import jakarta.annotation.Nonnull import java.time.Instant import java.time.ZoneId import java.time.ZonedDateTime diff --git a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestConfiguration.kt.ejs b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestConfiguration.kt.ejs index 526411d94..7ee34c9e9 100644 --- a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestConfiguration.kt.ejs +++ b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestConfiguration.kt.ejs @@ -18,7 +18,7 @@ -%> package <%= packageName %>.config -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Configuration diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_persistence.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_persistence.ejs index 0e548fd29..9838fb4d6 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_persistence.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/domain/_persistClass_.kt.jhi.jakarta_persistence.ejs @@ -21,7 +21,7 @@ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process. -%> <&_ if (fragment.importSection) { -&> -import javax.persistence.* +import jakarta.persistence.* <%_ if ((prodDatabaseTypePostgresql && anyFieldHasTextContentType) || (anyFieldIsUUID && (prodDatabaseTypeMysql || prodDatabaseTypeMariadb))) { _%> import org.hibernate.annotations.Type <%_ } _%> diff --git a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationshipsImpl.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationshipsImpl.kt.ejs index 7e138fc5d..3d6e21729 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationshipsImpl.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/main/kotlin/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationshipsImpl.kt.ejs @@ -24,8 +24,8 @@ import java.util.Optional import java.util.UUID <%_ } _%> -import javax.persistence.EntityManager -import javax.persistence.PersistenceContext +import jakarta.persistence.EntityManager +import jakarta.persistence.PersistenceContext import org.hibernate.annotations.QueryHints import org.springframework.data.domain.Page diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapper.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapper.kt.ejs index 3d92271d7..87047ba90 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapper.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/repository/timezone/DateTimeWrapper.kt.ejs @@ -18,7 +18,7 @@ -%> package <%= packageName %>.repository.timezone -import javax.persistence.* +import jakarta.persistence.* import java.io.Serializable import java.time.* diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/Application.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/Application.kt.ejs index 2c5782e22..991c25299 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/Application.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/Application.kt.ejs @@ -33,7 +33,7 @@ import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.core.env.Environment -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct import java.net.InetAddress import java.net.UnknownHostException diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/repository/UserRepository.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/repository/UserRepository.kt.ejs index 9b8651acf..2b42e364b 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/repository/UserRepository.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/repository/UserRepository.kt.ejs @@ -117,9 +117,9 @@ import reactor.util.function.Tuples <%_ } _%> <%_ if (databaseTypeCassandra) { _%> -import javax.validation.ConstraintViolation -import javax.validation.ConstraintViolationException -import javax.validation.Validator +import jakarta.validation.ConstraintViolation +import jakarta.validation.ConstraintViolationException +import jakarta.validation.Validator <%_ } _%> <%_ if (!reactive) { _%> import java.util.Optional diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs index c4b991fdf..6eef3e415 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs @@ -30,7 +30,7 @@ package <%= entityAbsolutePackage %>.service const repository = entityInstance + 'Repository'; const criteria = entityClass + 'Criteria'; _%> -import javax.persistence.criteria.JoinType +import jakarta.persistence.criteria.JoinType import org.slf4j.LoggerFactory import org.springframework.data.domain.Page diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs index 288cbc3ec..159fcc498 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs @@ -35,7 +35,7 @@ import java.time.ZonedDateTime import java.time.Duration <%_ } _%> <%_ if (anyPropertyHasValidation) { _%> -import javax.validation.constraints.* +import jakarta.validation.constraints.* <%_ } _%> import java.io.Serializable <%_ if (anyFieldIsBigDecimal) { _%> @@ -48,7 +48,7 @@ import java.nio.ByteBuffer import java.util.UUID <%_ } _%> <%_ if (anyFieldIsBlobDerived && databaseTypeSql) { _%> -import javax.persistence.Lob +import jakarta.persistence.Lob <%_ } _%> <%_ Object.keys(uniqueEnums).forEach(function(element) { _%> import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %> diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs index e300b9c0c..6af82aebe 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs @@ -73,8 +73,8 @@ import reactor.core.publisher.Flux import reactor.core.publisher.Mono <%_ } _%> -import javax.validation.constraints.Pattern -import javax.validation.Valid +import jakarta.validation.constraints.Pattern +import jakarta.validation.Valid import java.net.URI import java.net.URISyntaxException <%_ if (searchEngineElasticsearch && !reactive) { _%> diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/_entityClass_Resource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/_entityClass_Resource.kt.ejs index 358565fe3..0bc6e2a10 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/_entityClass_Resource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/_entityClass_Resource.kt.ejs @@ -89,8 +89,8 @@ import reactor.core.publisher.Mono <%_ } _%> <%_ if (anyPropertyHasValidation) { _%> -import javax.validation.Valid -import javax.validation.constraints.NotNull +import jakarta.validation.Valid +import jakarta.validation.constraints.NotNull <%_ } _%> import java.net.URI import java.net.URISyntaxException diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/WebConfigurer.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/WebConfigurer.kt.ejs index c75ea0864..16b68d376 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/WebConfigurer.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/WebConfigurer.kt.ejs @@ -94,9 +94,9 @@ import reactor.core.publisher.Mono <%_ } _%> <%_ if (!reactive) { _%> -import javax.servlet.DispatcherType -import javax.servlet.ServletContext -import javax.servlet.ServletException +import jakarta.servlet.DispatcherType +import jakarta.servlet.ServletContext +import jakarta.servlet.ServletException <%_ if (!skipClient) { _%> import java.io.File import java.nio.charset.StandardCharsets diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/AbstractAuditingEntity.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/AbstractAuditingEntity.kt.ejs index 0f01d0c81..d1c3329c8 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/AbstractAuditingEntity.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/AbstractAuditingEntity.kt.ejs @@ -25,11 +25,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties import java.io.Serializable import java.time.Instant <%_ if (databaseTypeSql) { _%> -import javax.persistence.Column +import jakarta.persistence.Column <%_ } _%> <%_ if (databaseTypeSql && !reactive) { _%> -import javax.persistence.EntityListeners -import javax.persistence.MappedSuperclass +import jakarta.persistence.EntityListeners +import jakarta.persistence.MappedSuperclass <%_ } _%> <%_ if (!reactive) { _%> diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/PersistentToken.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/PersistentToken.kt.ejs index 426365269..5a984b5fe 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/PersistentToken.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/PersistentToken.kt.ejs @@ -54,14 +54,14 @@ import <%= packageName %>.domain.Authority.Companion.TYPE_NAME <%_ } _%> <%_ if (databaseTypeSql) { _%> -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.ManyToOne -import javax.persistence.Table -<%_ } _%> -import javax.validation.constraints.NotNull -import javax.validation.constraints.Size +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.ManyToOne +import jakarta.persistence.Table +<%_ } _%> +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Size import java.io.Serializable <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%> diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/User.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/User.kt.ejs index 0e027b461..ee61092bc 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/domain/User.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/domain/User.kt.ejs @@ -77,23 +77,23 @@ import org.springframework.data.elasticsearch.annotations.FieldType <%_ } _%> <%_ if (databaseTypeSql && !reactive) { _%> -import javax.persistence.CascadeType -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.GeneratedValue -import javax.persistence.GenerationType -import javax.persistence.Id -import javax.persistence.JoinColumn -import javax.persistence.JoinTable -import javax.persistence.ManyToMany -import javax.persistence.OneToMany -import javax.persistence.SequenceGenerator -import javax.persistence.Table +import jakarta.persistence.CascadeType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.GenerationType +import jakarta.persistence.Id +import jakarta.persistence.JoinColumn +import jakarta.persistence.JoinTable +import jakarta.persistence.ManyToMany +import jakarta.persistence.OneToMany +import jakarta.persistence.SequenceGenerator +import jakarta.persistence.Table <%_ } _%> -import javax.validation.constraints.Email -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import java.io.Serializable import java.time.Instant import java.util.Locale diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/repository/PersistentTokenRepository.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/repository/PersistentTokenRepository.kt.ejs index 6d65cfdfc..bae3202bd 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/repository/PersistentTokenRepository.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/repository/PersistentTokenRepository.kt.ejs @@ -50,8 +50,8 @@ import org.springframework.data.neo4j.repository.Neo4jRepository import org.springframework.boot.autoconfigure.cassandra.CassandraProperties import org.springframework.stereotype.Repository -import javax.validation.ConstraintViolationException -import javax.validation.Validator +import jakarta.validation.ConstraintViolationException +import jakarta.validation.Validator <%_ } _%> <%_ if (databaseTypeCassandra || databaseTypeCouchbase) { _%> diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/security/PersistentTokenRememberMeServices.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/security/PersistentTokenRememberMeServices.kt.ejs index 66afea306..0b24754eb 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/security/PersistentTokenRememberMeServices.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/security/PersistentTokenRememberMeServices.kt.ejs @@ -42,8 +42,8 @@ import org.springframework.security.web.authentication.rememberme.InvalidCookieE import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationException import org.springframework.stereotype.Service -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse import java.io.Serializable <%_ if (['sql', 'mongodb', 'neo4j', 'couchbase'].includes(databaseType)) { _%> import java.time.LocalDate diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs index eaa5dff0b..eb97f8483 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs @@ -24,7 +24,7 @@ import tech.jhipster.config.JHipsterProperties import java.nio.charset.StandardCharsets import java.util.Locale -import javax.mail.MessagingException +import jakarta.mail.MessagingException import org.slf4j.LoggerFactory import org.springframework.context.MessageSource diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/AdminUserDTO.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/AdminUserDTO.kt.ejs index ea39633b0..f6ff295bc 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/AdminUserDTO.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/dto/AdminUserDTO.kt.ejs @@ -27,7 +27,7 @@ import <%= user.entityAbsoluteClass %> <%_ } _%> import java.io.Serializable -import javax.validation.constraints.* +import jakarta.validation.constraints.* <%_ if (databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase || databaseTypeSql) { _%> import java.time.Instant <%_ } _%> diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/filter/OAuth2RefreshTokensWebFilter.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/filter/OAuth2RefreshTokensWebFilter.kt.ejs index 110236524..7149b2895 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/filter/OAuth2RefreshTokensWebFilter.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/filter/OAuth2RefreshTokensWebFilter.kt.ejs @@ -19,10 +19,10 @@ package <%= packageName %>.web.filter import java.io.IOException -import javax.servlet.FilterChain -import javax.servlet.ServletException -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse +import jakarta.servlet.FilterChain +import jakarta.servlet.ServletException +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse import org.springframework.security.core.Authentication import org.springframework.security.core.context.SecurityContextHolder diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs index 4899c75f5..fd3378800 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs @@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController import org.springframework.web.server.ServerWebExchange import reactor.core.publisher.Mono <%_ } else { _%> -import javax.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletRequest <%_ } _%> import java.security.Principal @@ -109,7 +109,7 @@ import org.springframework.web.bind.annotation.RestController import org.springframework.web.server.ServerWebExchange import reactor.core.publisher.Mono <%_ } else { _%> -import javax.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletRequest <%_ } _%> @RestController @@ -218,9 +218,9 @@ import reactor.core.publisher.Mono <%_ } _%> <%_ if (!reactive) { _%> -import javax.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletRequest <%_ } _%> -import javax.validation.Valid +import jakarta.validation.Valid <%_ if (authenticationTypeSession && !reactive) { _%> import java.nio.charset.StandardCharsets import java.net.URLDecoder diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthenticateController.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthenticateController.kt.ejs index 8348085a1..7c52207e5 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthenticateController.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AuthenticateController.kt.ejs @@ -44,7 +44,7 @@ import reactor.core.publisher.Mono import reactor.core.scheduler.Schedulers <%_ } _%> -import javax.validation.Valid +import jakarta.validation.Valid /** * Controller to authenticate users. diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_imperative.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_imperative.kt.ejs index 6ffe1b8b2..cd2699d2b 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_imperative.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/LogoutResource_imperative.kt.ejs @@ -26,7 +26,7 @@ import org.springframework.security.oauth2.core.oidc.OidcIdToken import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RestController -import javax.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletRequest import org.springframework.http.HttpHeaders /** diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ExceptionTranslator.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ExceptionTranslator.kt.ejs index 4208726e6..91f051d6b 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ExceptionTranslator.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ExceptionTranslator.kt.ejs @@ -60,7 +60,7 @@ import reactor.core.publisher.Mono <%_ } _%> <%_ if (!reactive) { _%> -import javax.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletRequest <%_ } _%> import java.net.URI diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/LoginVM.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/LoginVM.kt.ejs index 79f8820e7..8850e6f51 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/LoginVM.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/LoginVM.kt.ejs @@ -18,8 +18,8 @@ -%> package <%= packageName %>.web.rest.vm -import javax.validation.constraints.NotNull -import javax.validation.constraints.Size +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Size /** * View Model object for storing a user's credentials. diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/ManagedUserVM.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/ManagedUserVM.kt.ejs index 8754ef37c..2d20b4152 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/ManagedUserVM.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/vm/ManagedUserVM.kt.ejs @@ -20,7 +20,7 @@ package <%= packageName %>.web.rest.vm import <%= packageName %>.service.dto.<%= user.adminUserDto %> <%_ if (!authenticationTypeOauth2) { _%> -import javax.validation.constraints.Size +import jakarta.validation.constraints.Size <%_ } _%> /** diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/PublicUserResourceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/PublicUserResourceIT.kt.ejs index fd19260d4..deb615f24 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/PublicUserResourceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/PublicUserResourceIT.kt.ejs @@ -69,7 +69,7 @@ import reactor.core.publisher.Mono <%_ } _%> <%_ if (databaseTypeSql && !reactive) { _%> -import javax.persistence.EntityManager +import jakarta.persistence.EntityManager <%_ } _%> <%_ if (databaseTypeCassandra || databaseTypeCouchbase) { _%> import java.util.stream.Stream diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/UserResourceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/UserResourceIT.kt.ejs index cdb8b822f..261c022bb 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/UserResourceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/UserResourceIT.kt.ejs @@ -86,7 +86,7 @@ import reactor.core.publisher.Mono <%_ } _%> <%_ if (databaseTypeSql && !reactive) { _%> -import javax.persistence.EntityManager +import jakarta.persistence.EntityManager <%_ } _%> <%_ if (!databaseTypeCassandra) { _%> import java.time.Instant diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.kt.ejs index e0b6aca6e..a7b8c891c 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.kt.ejs @@ -164,7 +164,7 @@ import reactor.core.publisher.Mono <%_ } _%> import org.springframework.validation.Validator <%_ if (databaseTypeSql && !reactive) { _%> -import javax.persistence.EntityManager +import jakarta.persistence.EntityManager <%_ } _%> <%_ if (anyFieldIsBigDecimal) { _%> import java.math.BigDecimal diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTest.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTest.kt.ejs index 01f6ab92b..120b8e91b 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTest.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/config/WebConfigurerTest.kt.ejs @@ -30,11 +30,11 @@ import org.springframework.mock.env.MockEnvironment import org.springframework.mock.web.MockServletContext import org.springframework.test.web.servlet.setup.MockMvcBuilders -import javax.servlet.Filter -import javax.servlet.FilterRegistration -import javax.servlet.Servlet -import javax.servlet.ServletException -import javax.servlet.ServletRegistration +import jakarta.servlet.Filter +import jakarta.servlet.FilterRegistration +import jakarta.servlet.Servlet +import jakarta.servlet.ServletException +import jakarta.servlet.ServletRegistration <%_ if (!skipClient) { _%> import java.io.File diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs index c9feb9832..a385345a3 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs @@ -32,11 +32,11 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.mail.MailSendException import org.springframework.mail.javamail.JavaMailSender -import javax.mail.Multipart -import javax.mail.Session -import javax.mail.internet.MimeBodyPart -import javax.mail.internet.MimeMessage -import javax.mail.internet.MimeMultipart +import jakarta.mail.Multipart +import jakarta.mail.Session +import jakarta.mail.internet.MimeBodyPart +import jakarta.mail.internet.MimeMessage +import jakarta.mail.internet.MimeMultipart import java.io.ByteArrayOutputStream import java.io.File import java.io.FileInputStream diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/TestUtil.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/TestUtil.kt.ejs index 196718efc..fd39f20bf 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/TestUtil.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/TestUtil.kt.ejs @@ -38,7 +38,7 @@ import org.springframework.security.test.context.TestSecurityContextHolder <%_ } _%> <%_ if (databaseTypeSql) { _%> -import javax.persistence.EntityManager +import jakarta.persistence.EntityManager <%_ } _%> <%_ if (searchEngineCouchbase) { _%> diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorTestController.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorTestController.kt.ejs index 58ebe7dc1..ac92a3f4e 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorTestController.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/web/rest/errors/ExceptionTranslatorTestController.kt.ejs @@ -33,8 +33,8 @@ import org.springframework.web.bind.annotation.RequestPart import org.springframework.web.bind.annotation.ResponseStatus import org.springframework.web.bind.annotation.RestController -import javax.validation.Valid -import javax.validation.constraints.NotNull +import jakarta.validation.Valid +import jakarta.validation.constraints.NotNull @RestController @RequestMapping("/api/exception-translator-test") From b5d2fbf81ed87e75b5ca41eac907f54d3d7d8d3d Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 21:27:32 -0300 Subject: [PATCH 05/10] add javax migration transform --- generators/migration/generator.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/generators/migration/generator.js b/generators/migration/generator.js index f32cf640f..fb00b30e2 100644 --- a/generators/migration/generator.js +++ b/generators/migration/generator.js @@ -60,6 +60,17 @@ export default class extends BaseApplicationGenerator { file.contents = Buffer.from(file.contents.toString().replaceAll('jakarta.', 'javax.')); }), ); + + this.queueTransformStream( + { + name: 'reverting kt files to javax', + filter: file => file.path.endsWith('.kt'), + refresh: false, + }, + passthrough(file => { + file.contents = Buffer.from(file.contents.toString().replaceAll('import jakarta.', 'import javax.')); + }), + ); }, }); } From 1d1646390f10abd84200f37704f69b7cc17e6b18 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 21:27:47 -0300 Subject: [PATCH 06/10] use dockerContainers --- .../src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs | 2 +- .../src/test/kotlin/_package_/config/RedisTestContainer.kt.ejs | 2 +- .../test/kotlin/_package_/config/CassandraTestContainer.kt.ejs | 2 +- .../test/kotlin/_package_/config/CouchbaseTestContainer.kt.ejs | 2 +- .../kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs | 2 +- .../test/kotlin/_package_/config/MongoDbTestContainer.kt.ejs | 2 +- .../src/test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs | 2 +- .../test/kotlin/_package_/config/MariadbTestContainer.kt.ejs | 2 +- .../src/test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs | 2 +- .../src/test/kotlin/_package_/config/MysqlTestContainer.kt.ejs | 2 +- .../test/kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs index db39544f6..e187b7cde 100644 --- a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs +++ b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs @@ -32,7 +32,7 @@ class KafkaTestContainer: InitializingBean, DisposableBean { private val log = LoggerFactory.getLogger(KafkaTestContainer::class.java) @JvmStatic - private var kafkaContainer: KafkaContainer = KafkaContainer(DockerImageName.parse("<%= DOCKER_KAFKA %>")) + private var kafkaContainer: KafkaContainer = KafkaContainer(DockerImageName.parse("<%= dockerContainers.kafka %>")) .withLogConsumer(Slf4jLogConsumer(log)) .withReuse(true) } diff --git a/generators/spring-boot/templates/spring-cache/src/test/kotlin/_package_/config/RedisTestContainer.kt.ejs b/generators/spring-boot/templates/spring-cache/src/test/kotlin/_package_/config/RedisTestContainer.kt.ejs index c13f7c0d3..1e2ab2670 100644 --- a/generators/spring-boot/templates/spring-cache/src/test/kotlin/_package_/config/RedisTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-cache/src/test/kotlin/_package_/config/RedisTestContainer.kt.ejs @@ -39,7 +39,7 @@ class RedisTestContainer: InitializingBean, DisposableBean { override fun afterPropertiesSet() { if (null == redisContainer) { - redisContainer = GenericContainer("<%= DOCKER_REDIS %>") + redisContainer = GenericContainer("<%= dockerContainers.redis %>") .withExposedPorts(6379) .withLogConsumer(Slf4jLogConsumer(log)) .withReuse(true) diff --git a/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/config/CassandraTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/config/CassandraTestContainer.kt.ejs index 89cb4e0bf..c36f9c76a 100644 --- a/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/config/CassandraTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-cassandra/src/test/kotlin/_package_/config/CassandraTestContainer.kt.ejs @@ -56,7 +56,7 @@ class CassandraTestContainer : InitializingBean, DisposableBean { private val CONTAINER_STARTUP_TIMEOUT_MINUTES = 10.toLong() @JvmStatic - private var cassandraContainer: CassandraContainer<*> = CassandraContainer(DockerImageName.parse("<%= DOCKER_CASSANDRA %>")) + private var cassandraContainer: CassandraContainer<*> = CassandraContainer(DockerImageName.parse("<%= dockerContainers.cassandra %>")) .withStartupTimeout(Duration.of(CONTAINER_STARTUP_TIMEOUT_MINUTES, ChronoUnit.MINUTES)) .withLogConsumer(Slf4jLogConsumer(log)) .withReuse(true) as CassandraContainer<*> diff --git a/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/CouchbaseTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/CouchbaseTestContainer.kt.ejs index 62537dc1c..826adff4e 100644 --- a/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/CouchbaseTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-couchbase/src/test/kotlin/_package_/config/CouchbaseTestContainer.kt.ejs @@ -46,7 +46,7 @@ class CouchbaseTestContainer : InitializingBean, DisposableBean { override fun afterPropertiesSet() { if (null == couchbaseContainer) { - val dockerImage = DockerImageName.parse("<%= DOCKER_COUCHBASE %>") + val dockerImage = DockerImageName.parse("<%= dockerContainers.couchbase %>") .asCompatibleSubstituteFor("couchbase/server") couchbaseContainer = CouchbaseContainer(dockerImage) .withBucket(BucketDefinition(bucketName)) diff --git a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs index 193b32e92..80b4b0f9f 100644 --- a/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-elasticsearch/src/test/kotlin/_package_/config/ElasticsearchTestContainer.kt.ejs @@ -47,7 +47,7 @@ class ElasticsearchTestContainer: InitializingBean, DisposableBean { override fun afterPropertiesSet() { if (null == elasticsearchContainer) { elasticsearchContainer = - ElasticsearchContainer(DockerImageName.parse("<%= DOCKER_ELASTICSEARCH_CONTAINER %>").withTag("<%= ELASTICSEARCH_VERSION %>%>")) + ElasticsearchContainer(DockerImageName.parse("<%= dockerContainers.elasticsearchImage %>").withTag("<%= dockerContainers.elasticsearchTag %>%>")) .withStartupTimeout(Duration.of(CONTAINER_STARTUP_TIMEOUT_MINUTES, ChronoUnit.MINUTES)) .withSharedMemorySize(256000000L) .withEnv("ES_JAVA_OPTS", "-Xms256m -Xmx256m") diff --git a/generators/spring-boot/templates/spring-data-mongodb/src/test/kotlin/_package_/config/MongoDbTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-mongodb/src/test/kotlin/_package_/config/MongoDbTestContainer.kt.ejs index 2af60e29b..39bf46a78 100644 --- a/generators/spring-boot/templates/spring-data-mongodb/src/test/kotlin/_package_/config/MongoDbTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-mongodb/src/test/kotlin/_package_/config/MongoDbTestContainer.kt.ejs @@ -36,7 +36,7 @@ class MongoDbTestContainer: InitializingBean, DisposableBean { private val log = LoggerFactory.getLogger(MongoDbTestContainer::class.java) @JvmStatic - private var mongodbContainer: MongoDBContainer = MongoDBContainer("<%= DOCKER_MONGODB %>") + private var mongodbContainer: MongoDBContainer = MongoDBContainer("<%= dockerContainers.mongodb %>") .withTmpFs(Collections.singletonMap("/testtmpfs", "rw")) /* .withCommand( "--nojournal --wiredTigerCacheSizeGB 0.25 --wiredTigerCollectionBlockCompressor none --slowOpSampleRate 0 --setParameter ttlMonitorEnabled=false --setParameter diagnosticDataCollectionEnabled=false --setParameter logicalSessionRefreshMillis=6000000 --setParameter enableFlowControl=false --setParameter oplogFetcherUsesExhaust=false --setParameter disableResumableRangeDeleter=true --setParameter enableShardedIndexConsistencyCheck=false --setParameter enableFinerGrainedCatalogCacheRefresh=false --setParameter readHedgingMode=off --setParameter loadRoutingTableOnStartup=false --setParameter rangeDeleterBatchDelayMS=2000000 --setParameter skipShardingConfigurationChecks=true --setParameter syncdelay=3600" diff --git a/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs index e38aed20a..9d13b6623 100644 --- a/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-neo4j/src/test/kotlin/_package_/config/Neo4jTestContainer.kt.ejs @@ -46,7 +46,7 @@ class Neo4jTestContainer: InitializingBean, DisposableBean { override fun afterPropertiesSet() { if (null == neo4jContainer) { - neo4jContainer = Neo4jContainer(DockerImageName.parse("<%= DOCKER_NEO4J %>")) + neo4jContainer = Neo4jContainer(DockerImageName.parse("<%= dockerContainers.neo4j %>")) .withoutAuthentication() .withStartupTimeout(Duration.of(CONTAINER_STARTUP_TIMEOUT_MINUTES, ChronoUnit.MINUTES)) .withLogConsumer(Slf4jLogConsumer(log)) diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MariadbTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MariadbTestContainer.kt.ejs index a2c90e0c3..804898404 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MariadbTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MariadbTestContainer.kt.ejs @@ -40,7 +40,7 @@ class MariadbTestContainer: SqlTestContainer { override fun afterPropertiesSet() { if (null == mariaDBContainer) { - mariaDBContainer = MariaDBContainer("<%= DOCKER_MARIADB %>") + mariaDBContainer = MariaDBContainer("<%= dockerContainers.mariadb %>") .withDatabaseName("<%= baseName %>") .withTmpFs(Collections.singletonMap("/testtmpfs", "rw")) .withLogConsumer(Slf4jLogConsumer(log)) diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs index 51ea66f20..9e1aa4239 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MsSqlTestContainer.kt.ejs @@ -40,7 +40,7 @@ class MsSqlTestContainer: SqlTestContainer { override fun afterPropertiesSet() { if (null == mSSQLServerContainer) { - mSSQLServerContainer = MSSQLServerContainer("<%= DOCKER_MSSQL %>") + mSSQLServerContainer = MSSQLServerContainer("<%= dockerContainers.mssql %>") .withTmpFs(Collections.singletonMap("/testtmpfs", "rw")) .withLogConsumer(Slf4jLogConsumer(log)) .withReuse(true) diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MysqlTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MysqlTestContainer.kt.ejs index 5cbcaae6e..1b7273b53 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MysqlTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/MysqlTestContainer.kt.ejs @@ -40,7 +40,7 @@ class MysqlTestContainer : SqlTestContainer { override fun afterPropertiesSet() { if (null == mysqlContainer) { - mysqlContainer = MySQLContainer("<%= DOCKER_MYSQL %>-debian") + mysqlContainer = MySQLContainer("<%= dockerContainers.mysql %>-debian") .withDatabaseName("<%= baseName %>") .withTmpFs(Collections.singletonMap("/testtmpfs", "rw")) .withLogConsumer(Slf4jLogConsumer(log)) diff --git a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs index 362d3ecde..4962a3066 100644 --- a/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs +++ b/generators/spring-boot/templates/spring-data-relational/src/test/kotlin/_package_/config/PostgreSqlTestContainer.kt.ejs @@ -38,7 +38,7 @@ class PostgreSqlTestContainer : SqlTestContainer { override fun afterPropertiesSet() { if (null == postgreSQLContainer) { - postgreSQLContainer = PostgreSQLContainer("<%= DOCKER_POSTGRESQL %>") + postgreSQLContainer = PostgreSQLContainer("<%= dockerContainers.postgresql %>") .withDatabaseName("<%= baseName %>") .withTmpFs(Collections.singletonMap("/testtmpfs", "rw")) .withLogConsumer(Slf4jLogConsumer(log)) From ea7516cddef9d462d7c559c53f5e4695aac060b1 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 21:40:32 -0300 Subject: [PATCH 07/10] backport some changes --- .../service/_entityClass_QueryService.kt.ejs | 2 +- .../service/criteria/_entityClass_Criteria.kt.ejs | 2 +- .../_entityPackage_/service/dto/_dtoClass_.kt.ejs | 4 ++-- .../service/mapper/_entityClass_Mapper.kt.ejs | 2 +- .../_entityPackage_/web/rest/UserResource.kt.ejs | 2 -- .../main/kotlin/_package_/config/Constants.kt.ejs | 6 +++--- .../kotlin/_package_/service/MailService.kt.ejs | 14 ++++++++++---- .../_package_/web/rest/AccountResource.kt.ejs | 4 ++-- .../web/rest/errors/ErrorConstants.kt.ejs | 2 +- .../kotlin/_package_/TechnicalStructureTest.kt.ejs | 12 ++++++------ .../kotlin/_package_/service/MailServiceIT.kt.ejs | 4 ++-- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs index 6eef3e415..188808d1a 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/_entityClass_QueryService.kt.ejs @@ -145,7 +145,7 @@ class <%= serviceClassName %>( const metamodelFieldName = (relationship.relationshipManyToMany || relationship.relationshipType === 'one-to-many') ? relationship.relationshipFieldNamePlural : relationship.relationshipFieldName; _%> if (criteria.<%= relationship.relationshipName %>Id != null) { specification = specification.and(buildSpecification(criteria.<%= relationship.relationshipName %>Id as Filter<<%= relationship.otherEntity.primaryKey.type %>>) { - it.join(<%= persistClass %>_.<%= metamodelFieldName %>, JoinType.LEFT).get(<%= asEntity(relationship.otherEntityNameCapitalized) %>_.<%= relationship.otherEntity.primaryKey.name %>) + it.join(<%= persistClass %>_.<%= metamodelFieldName %>, JoinType.LEFT).get(<%= relationship.otherEntity.persistClass %>_.<%= relationship.otherEntity.primaryKey.name %>) }) } <%_ }); // forEach diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.kt.ejs index 3e86ff413..c425559b7 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.kt.ejs @@ -31,7 +31,7 @@ import tech.jhipster.service.filter.* var extraFilters = {}; fields.filter(field => !field.transient).forEach((field) => { const fieldType = field.fieldType; - if (isFilterableType(fieldType)) { + if (field.filterableField) { var filterType; if (field.fieldIsEnum == true) { filterType = fieldType + 'Filter'; diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs index 159fcc498..411349d6b 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/dto/_dtoClass_.kt.ejs @@ -92,9 +92,9 @@ data class <%= dtoClass %>( if (field && field.blobContentTypeText) { property = `var ${reference.name}: String? = null`; } else if (reference.collection && reference.relationship) { - property = `var ${reference.name}: MutableSet<${asDto(reference.relationship.otherEntity.entityNameCapitalized)}> = mutableSetOf()`; + property = `var ${reference.name}: MutableSet<${reference.relationship.otherEntity.dtoClass}> = mutableSetOf()`; } else if (reference.relationship) { - property = `var ${reference.name}: ${asDto(reference.relationship.otherEntity.entityNameCapitalized)}? = null`; + property = `var ${reference.name}: ${reference.relationship.otherEntity.dtoClass}? = null`; } else if (reference.type === 'byte[]') { property = `var ${reference.name}: ByteArray? = null`; } else if (reference.type === 'Integer') { diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.kt.ejs index c45e00489..b474acbcc 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.kt.ejs @@ -40,7 +40,7 @@ _%> import <%= entityAbsoluteClass %> import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %> -<%_ for (const otherEntity of this._.uniq(dtoRelationships.map(relationship => relationship.otherEntity).filter(otherEntity => otherEntity !== entity))) { _%> +<%_ for (const otherEntity of this._.uniq(dtoRelationships.map(relationship => relationship.otherEntity).filter(otherEntity => otherEntity.entityClass !== entityClass))) { _%> import <%= otherEntity.entityAbsoluteClass.replace('undefined',entityAbsolutePackage ) %> import <%= otherEntity.entityAbsolutePackage || entityAbsolutePackage %>.service.dto.<%= otherEntity.dtoClass %> <%_ } _%> diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs index 6af82aebe..b586fbe5e 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/_entityPackage_/web/rest/UserResource.kt.ejs @@ -80,8 +80,6 @@ import java.net.URISyntaxException <%_ if (searchEngineElasticsearch && !reactive) { _%> import java.util.stream.Collectors import java.util.stream.StreamSupport - -import org.elasticsearch.index.query.QueryBuilders.queryStringQuery <%_ } _%> /** diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/config/Constants.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/Constants.kt.ejs index a87dc4e39..f6c95355f 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/config/Constants.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/config/Constants.kt.ejs @@ -18,14 +18,14 @@ -%> package <%= packageName %>.config -<%_ if (!skipUserManagement || authenticationTypeOauth2) { _%> +<%_ if (generateBuiltInUserEntity) { _%> // Regex for acceptable logins const val LOGIN_REGEX: String = "<%- LOGIN_REGEX %>" <%_ } _%> -<%_ if (!skipUserManagement || authenticationTypeOauth2 || ['sql','mongodb','couchbase'].includes(databaseType)) { _%> +<%_ if (generateBuiltInUserEntity || ['sql','mongodb','couchbase'].includes(databaseType)) { _%> const val SYSTEM_ACCOUNT: String = "system" <%_ } _%> -<%_ if (!skipUserManagement || authenticationTypeOauth2) { _%> +<%_ if (generateUserManagement || authenticationTypeOauth2) { _%> const val DEFAULT_LANGUAGE: String = "<%= nativeLanguage %>" <%_ } _%> <%_ if (databaseTypeCouchbase) { _%> diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs index eb97f8483..cf380b0b4 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/service/MailService.kt.ejs @@ -27,7 +27,9 @@ import java.util.Locale import jakarta.mail.MessagingException import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.MessageSource +import org.springframework.context.annotation.Lazy import org.springframework.mail.MailException import org.springframework.mail.javamail.JavaMailSender import org.springframework.mail.javamail.MimeMessageHelper @@ -54,6 +56,10 @@ class MailService( private val log = LoggerFactory.getLogger(javaClass) + @Autowired + @Lazy + private lateinit var self: MailService + @Async fun sendEmail(to: String, subject: String, content: String, isMultipart: Boolean, isHtml: Boolean) { log.debug( @@ -91,26 +97,26 @@ class MailService( } val content = templateEngine.process(templateName, context) val subject = messageSource.getMessage(titleKey, null, locale) - sendEmail(user.email!!, subject, content, isMultipart = false, isHtml = true) + self.sendEmail(user.email!!, subject, content, isMultipart = false, isHtml = true) } <%_ if (!authenticationTypeOauth2) { _%> @Async fun sendActivationEmail(user: <%= user.persistClass %>) { log.debug("Sending activation email to '${user.email}'") - sendEmailFromTemplate(user, "mail/activationEmail", "email.activation.title") + self.sendEmailFromTemplate(user, "mail/activationEmail", "email.activation.title") } @Async fun sendCreationEmail(user: <%= user.persistClass %>) { log.debug("Sending creation email to '${user.email}'") - sendEmailFromTemplate(user, "mail/creationEmail", "email.activation.title") + self.sendEmailFromTemplate(user, "mail/creationEmail", "email.activation.title") } @Async fun sendPasswordResetMail(user: <%= user.persistClass %>) { log.debug("Sending password reset email to '${user.email}'") - sendEmailFromTemplate(user, "mail/passwordResetEmail", "email.reset.title") + self.sendEmailFromTemplate(user, "mail/passwordResetEmail", "email.reset.title") } <%_ } _%> } diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs index fd3378800..994a27cf2 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/AccountResource.kt.ejs @@ -357,7 +357,7 @@ class AccountResource( val userLogin = getCurrentUserLogin() .orElseThrow { AccountResourceException("") } val existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.email) - if (existingUser.isPresent && !existingUser.get().login.equals(userLogin, ignoreCase = true)) { + if (existingUser.isPresent && !existingUser.orElseThrow().login.equals(userLogin, ignoreCase = true)) { throw EmailAlreadyUsedException() } val user = userRepository.findOneByLogin(userLogin) @@ -455,7 +455,7 @@ class AccountResource( fun requestPasswordReset(@RequestBody mail: String) { val user = userService.requestPasswordReset(mail) if (user.isPresent()) { - mailService.sendPasswordResetMail(user.get()) + mailService.sendPasswordResetMail(user.orElseThrow()) } else { // Pretend the request has been successful to prevent checking which emails really exist // but log that an invalid attempt has been made diff --git a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ErrorConstants.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ErrorConstants.kt.ejs index f88a85a63..73652853a 100644 --- a/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ErrorConstants.kt.ejs +++ b/generators/spring-boot/templates/src/main/kotlin/_package_/web/rest/errors/ErrorConstants.kt.ejs @@ -29,7 +29,7 @@ const val PROBLEM_BASE_URL: String = "https://www.jhipster.tech/problem" val DEFAULT_TYPE: URI = URI.create("$PROBLEM_BASE_URL/problem-with-message") @JvmField val CONSTRAINT_VIOLATION_TYPE: URI = URI.create("$PROBLEM_BASE_URL/constraint-violation") -<%_ if (!skipUserManagement) { _%> +<%_ if (generateUserManagement) { _%> @JvmField val INVALID_PASSWORD_TYPE: URI = URI.create("$PROBLEM_BASE_URL/invalid-password") @JvmField diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/TechnicalStructureTest.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/TechnicalStructureTest.kt.ejs index f5f1039b7..3288ada59 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/TechnicalStructureTest.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/TechnicalStructureTest.kt.ejs @@ -37,15 +37,15 @@ _%> class TechnicalStructureTest { @ArchTest val respectsTechnicalArchitectureLayers = layeredArchitecture() - .layer("Config").definedBy("..config..") + .layer("Config").definedBy("..config..") <%_ if (hasClientLayer) { _%> - .layer("Client").definedBy("..client..") + .layer("Client").definedBy("..client..") <%_ } _%> - .layer("Web").definedBy("..web..") - .optionalLayer("Service").definedBy("..service..") - .layer("Security").definedBy("..security..") + .layer("Web").definedBy("..web..") + .optionalLayer("Service").definedBy("..service..") + .layer("Security").definedBy("..security..") <%_ if (hasDomainLayer) { _%> - .layer("Persistence").definedBy("..repository..") + .optionalLayer("Persistence").definedBy("..repository..") .layer("Domain").definedBy("..domain..") <%_ } _%> diff --git a/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs index a385345a3..14fa448d0 100644 --- a/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs +++ b/generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs @@ -233,7 +233,7 @@ class MailServiceIT { verify(javaMailSender, atLeastOnce()).send(messageCaptor.capture()) val message = messageCaptor.value - val propertyFilePath = "i18n/messages_${getJavaLocale(langKey)}.properties" + val propertyFilePath = "i18n/messages_${getMessageSourceSuffixForLanguage(langKey)}.properties" val resource = this::class.java.classLoader.getResource(propertyFilePath) assertNotNull(resource) val file = File(URI(resource.file).path) @@ -250,7 +250,7 @@ class MailServiceIT { /** * Convert a lang key to the Java locale. */ - private fun getJavaLocale(langKey: String): String { + private fun getMessageSourceSuffixForLanguage(langKey: String): String { var javaLangKey = langKey val matcher2 = PATTERN_LOCALE_2.matcher(langKey) if (matcher2.matches()) { From 8c08cbf19143d945a6230907fd1c9317218c2c84 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 22:17:30 -0300 Subject: [PATCH 08/10] adjust containers --- generators/spring-boot-v2/preparing-migration.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/generators/spring-boot-v2/preparing-migration.js b/generators/spring-boot-v2/preparing-migration.js index 5c00d0630..50be2908e 100644 --- a/generators/spring-boot-v2/preparing-migration.js +++ b/generators/spring-boot-v2/preparing-migration.js @@ -76,11 +76,19 @@ const javaDependenciesOverrides = { }; export const migrateApplicationTask = asWritingTask(async function ({ application, applicationDefaults }) { - // Downgrade elasticsearch to 7.17.4 + const { cassandra, mongodb, postgresql, couchbase, mariadb, mysql, neo4j, mssql } = jhipster7DockerContainers; + // Downgrade db and elasticsearch Object.assign(application.dockerContainers, { elasticsearchTag: ELASTICSEARCH_VERSION, elasticsearch: `${DOCKER_ELASTICSEARCH_CONTAINER}:${ELASTICSEARCH_VERSION}`, - ...jhipster7DockerContainers, + cassandra, + mongodb, + postgresql, + couchbase, + mariadb, + mysql, + neo4j, + mssql, }); Object.assign(application.javaDependencies, javaDependenciesOverrides); From 00750f6ec8ab0be80f94c9fb2176719bdf3792e9 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 23:51:33 -0300 Subject: [PATCH 09/10] Update preparing-migration.js --- generators/spring-boot-v2/preparing-migration.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/spring-boot-v2/preparing-migration.js b/generators/spring-boot-v2/preparing-migration.js index 50be2908e..c67edf8c2 100644 --- a/generators/spring-boot-v2/preparing-migration.js +++ b/generators/spring-boot-v2/preparing-migration.js @@ -76,7 +76,7 @@ const javaDependenciesOverrides = { }; export const migrateApplicationTask = asWritingTask(async function ({ application, applicationDefaults }) { - const { cassandra, mongodb, postgresql, couchbase, mariadb, mysql, neo4j, mssql } = jhipster7DockerContainers; + const { cassandra, mongodb, postgresql, couchbase, mariadb, mysql, neo4j, mssql, kafka } = jhipster7DockerContainers; // Downgrade db and elasticsearch Object.assign(application.dockerContainers, { elasticsearchTag: ELASTICSEARCH_VERSION, @@ -97,7 +97,7 @@ export const migrateApplicationTask = asWritingTask(async function ({ applicatio }); const dockerContainersVersions = Object.fromEntries( - Object.entries(application.dockerContainers).map(([containerName, container]) => [ + Object.entries({ ...application.dockerContainers, kafka }).map(([containerName, container]) => [ `DOCKER_${this._.snakeCase(containerName).toUpperCase().replace('_4_', '4')}`, container, ]), From 28c33582870d9a9cf49cbbcae9b5c761489936c0 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 27 Jan 2025 23:52:43 -0300 Subject: [PATCH 10/10] Update KafkaTestContainer.kt.ejs --- .../src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs index e187b7cde..db39544f6 100644 --- a/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs +++ b/generators/spring-boot/templates/kafka/src/test/kotlin/_package_/config/KafkaTestContainer.kt.ejs @@ -32,7 +32,7 @@ class KafkaTestContainer: InitializingBean, DisposableBean { private val log = LoggerFactory.getLogger(KafkaTestContainer::class.java) @JvmStatic - private var kafkaContainer: KafkaContainer = KafkaContainer(DockerImageName.parse("<%= dockerContainers.kafka %>")) + private var kafkaContainer: KafkaContainer = KafkaContainer(DockerImageName.parse("<%= DOCKER_KAFKA %>")) .withLogConsumer(Slf4jLogConsumer(log)) .withReuse(true) }